X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=f98e0841ea4b02332cc38b876a8272d18068fe7d;hp=abb98d7a29849c1c33bb5dff5b50026bda5910fa;hb=HEAD;hpb=b06aac0c55665b844a549bca41492ac257fdd3e3 diff --git a/loadcfg.c b/loadcfg.c index abb98d7a..188af095 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -7,7 +7,7 @@ * routine to load the configuration and the global * variables it writes to. * - * Copyright : Written by and Copyright (C) 2001-2017 the + * Copyright : Written by and Copyright (C) 2001-2022 the * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -430,7 +430,7 @@ static int parse_numeric_value(const char *name, const char *value) log_error(LOG_LEVEL_FATAL, "Directive %s used without argument", name); } - number = (int)strtol(value, &endptr, 0); + number = (int)strtol(value, &endptr, 10); if (*endptr != '\0') { log_error(LOG_LEVEL_FATAL, @@ -634,12 +634,12 @@ struct configuration_spec * load_config(void) config->proxy_args = strdup_or_die(""); config->forwarded_connect_retries = 0; #ifdef FEATURE_HTTPS_INSPECTION - config->ca_password = strdup(""); - ca_cert_file = strdup("cacert.crt"); - ca_key_file = strdup("cakey.pem"); - ca_directory = strdup("./CA"); - trusted_cas_file = strdup("trustedCAs.pem"); - certificate_directory = strdup("./certs"); + config->ca_password = strdup_or_die(""); + ca_cert_file = strdup_or_die("cacert.crt"); + ca_key_file = strdup_or_die("cakey.pem"); + ca_directory = strdup_or_die("./CA"); + trusted_cas_file = strdup_or_die("trustedCAs.pem"); + certificate_directory = strdup_or_die("./certs"); #endif #ifdef FEATURE_CLIENT_TAGS @@ -1602,7 +1602,7 @@ struct configuration_spec * load_config(void) * single-threaded 0|1 * *************************************************************************/ case hash_single_threaded : - config->multi_threaded = 0 == parse_toggle_state(cmd, arg); + config->multi_threaded = 0 == parse_toggle_state(cmd, arg); break; /* *************************************************************************