X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=2791abbb3c577f996bacbc4d7c4f3998c3dd88c8;hb=f157fb3e5e3041012a88b37d07f0cb3817c75fda;hp=3ee65b84313b86e9c34b18da64e4045ec7838353;hpb=43980e5c0dbe1b2090fa04f69c3989960f1d8975;p=privoxy.git
diff --git a/loadcfg.c b/loadcfg.c
index 3ee65b84..2791abbb 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.140 2014/06/02 06:19:06 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.142 2014/10/18 11:27:28 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -948,6 +948,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
+ freez(cur_fwd);
break;
}
@@ -1003,6 +1004,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
+ freez(cur_fwd);
break;
}
@@ -1044,11 +1046,14 @@ struct configuration_spec * load_config(void)
if (vec_count != 3)
{
- log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
- "forward-socks4a directive in configuration file.");
+ log_error(LOG_LEVEL_ERROR,
+ "Wrong number of parameters for %s in configuration file.",
+ cmd);
string_append(&config->proxy_args,
- "
\nWARNING: Wrong number of parameters for "
- "forward-socks4a directive in configuration file.");
+ "
\nWARNING: Wrong number of parameters for ");
+ string_append(&config->proxy_args, cmd);
+ string_append(&config->proxy_args,
+ "directive in configuration file.");
break;
}
@@ -1078,11 +1083,15 @@ struct configuration_spec * load_config(void)
/* Save the URL pattern */
if (create_pattern_spec(cur_fwd->url, vec[0]))
{
- log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
- "directive in configuration file.");
+ log_error(LOG_LEVEL_ERROR,
+ "Bad URL specifier for %s in configuration file.",
+ cmd);
string_append(&config->proxy_args,
- "
\nWARNING: Bad URL specifier for "
- "forward-socks4a directive in configuration file.");
+ "
\nWARNING: Bad URL specifier for ");
+ string_append(&config->proxy_args, cmd);
+ string_append(&config->proxy_args,
+ "directive in configuration file.");
+ freez(cur_fwd);
break;
}