nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double-free of torrc_fname

Browse Source 
svn:r5805
This commit is contained in:
Nick Mathewson 2006-01-11 20:01:47 +00:00
parent adbe0f0ada
commit fefa34d525
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/config.c
View File

@ -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;
}