nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-22 22:14:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak when options_init_from_string returns error #22605

Browse Source
This commit is contained in:
Daniel Pinto 2017-09-12 23:07:06 +01:00
parent 23147dd168
commit ade9baaf9b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/config.c
View File

@ -5210,6 +5210,12 @@ options_init_from_string(const char *cf_defaults, const char *cf,
return SETOPT_OK; return SETOPT_OK;
err: err:
if (opened_files) {
SMARTLIST_FOREACH(opened_files, char *, f, tor_free(f));
smartlist_free(opened_files);
}
// may have been set to opened_files, avoid double free
newoptions->FilesOpenedByIncludes = NULL;
or_options_free(newoptions); or_options_free(newoptions);
or_options_free(newdefaultoptions); or_options_free(newdefaultoptions);
if (*msg) { if (*msg) {