Tweak error handling in parse_config_line.

configuration.c

@@ -821,7 +821,7 @@ parse_config_line(int c, gnc_t gnc, void *closure)
     char *token;
 
     c = skip_whitespace(c, gnc, closure);
-    if(c == '\n' || c == '#')
+    if(c < 0 || c == '\n' || c == '#')
         return skip_to_eol(c, gnc, closure);
 
     c = getword(c, &token, gnc, closure);
@@ -832,36 +832,36 @@ parse_config_line(int c, gnc_t gnc, void *closure)
         struct filter *filter;
         c = parse_filter(c, gnc, closure, &filter);
         if(c < -1)
-            return -1;
+            goto fail;
         add_filter(filter, &input_filters);
     } else if(strcmp(token, "out") == 0) {
         struct filter *filter;
         c = parse_filter(c, gnc, closure, &filter);
         if(c < -1)
-            return -1;
+            goto fail;
         add_filter(filter, &output_filters);
     } else if(strcmp(token, "redistribute") == 0) {
         struct filter *filter;
         c = parse_filter(c, gnc, closure, &filter);
         if(c < -1)
-            return -1;
+            goto fail;
         add_filter(filter, &redistribute_filters);
     } else if(strcmp(token, "install") == 0) {
         struct filter *filter;
         c = parse_filter(c, gnc, closure, &filter);
         if(c < -1)
-            return -1;
+            goto fail;
     } else if(strcmp(token, "interface") == 0) {
         struct interface_conf *if_conf;
         c = parse_ifconf(c, gnc, closure, &if_conf);
         if(c < -1)
-            return -1;
+            goto fail;
         add_ifconf(if_conf, &interface_confs);
     } else if(strcmp(token, "default") == 0) {
         struct interface_conf *if_conf;
         c = parse_anonymous_ifconf(c, gnc, closure, NULL, &if_conf);
         if(c < -1)
-            return -1;
+            goto fail;
         if(default_interface_conf == NULL)
             default_interface_conf = if_conf;
         else {
@@ -872,10 +872,14 @@ parse_config_line(int c, gnc_t gnc, void *closure)
     } else {
         c = parse_option(c, gnc, closure, token);
         if(c < -1)
-            return -1;
+            goto fail;
     }
     free(token);
     return c;
+
+ fail:
+    free(token);
+    return -2;
 }
 
 struct file_state {