aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 01e4041d1..7cd85c2a6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2541,10 +2541,10 @@ options_init_from_torrc(int argc, char **argv)
log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, "
"using reasonable defaults.", fname);
tor_free(fname); /* sets fname to NULL */
+ torrc_fname = NULL;
} else {
log(LOG_WARN, LD_CONFIG,
"Unable to open configuration file \"%s\".", fname);
- tor_free(fname);
goto err;
}
} else { /* it opened successfully. use it. */
@@ -2578,6 +2578,7 @@ options_init_from_torrc(int argc, char **argv)
return 0;
err:
tor_free(fname);
+ torrc_fname = NULL;
config_free(&options_format, newoptions);
return -1;
}