commit 8b84c1457147c136ae6c13af5cda3d4824c2f34c
parent 0d88db67a383426c7c330ae54bbf8437f4ccb9ef
Author: htrb <htrb>
Date: Mon, 19 Jul 2010 12:25:53 +0000
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537706#10
* rc.c (interpret_rc): check line->length before call Strchop().
Diffstat:
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,12 @@
2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
+ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537706#10
+ * rc.c (interpret_rc): check line->length before call Strchop().
+
+2010-07-19 d+w3m@vdr.jp
+
+ * [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=366284#5
* rc.c (init_rc): check config_file is NULL or not.
(panel_set_option): check config_file instead of no_rc_dir.
diff --git a/rc.c b/rc.c
@@ -1071,9 +1071,11 @@ interpret_rc(FILE * f)
for (;;) {
line = Strfgets(f);
- Strchop(line);
- if (line->length == 0)
+ if (line->length == 0) /* end of file */
break;
+ Strchop(line);
+ if (line->length == 0) /* blank line */
+ continue;
Strremovefirstspaces(line);
if (line->ptr[0] == '#') /* comment */
continue;