nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Free options objects for which validation fails.

Browse Source 
Also free options objects when we discard them due to
TestingTorOptions.

Fixes bug 32555; bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2019-11-20 09:14:08 -05:00
parent 21b3303657
commit cf7580ab06
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/config/config.c
View File

@ -4590,6 +4590,7 @@ options_init_from_string(const char *cf_defaults, const char *cf,
newoptions->IncludeUsed = cf_has_include;
newoptions->FilesOpenedByIncludes = opened_files;
opened_files = NULL; // prevent double-free.
/* If this is a testing network configuration, change defaults
* for a list of dependent config options, and try this function again. */
@ -4600,13 +4601,11 @@ options_init_from_string(const char *cf_defaults, const char *cf,
goto err;
}
newoptions->IncludeUsed = cf_has_include;
newoptions->FilesOpenedByIncludes = opened_files;
opened_files = NULL; // prevent double-free.
err = options_validate_and_set(oldoptions, newoptions, msg);
if (err < 0)
if (err < 0) {
newoptions = NULL; // This was already freed in options_validate_and_set.
goto err;
}
or_options_free(global_default_options);
global_default_options = newdefaultoptions;
@ -4620,6 +4619,7 @@ options_init_from_string(const char *cf_defaults, const char *cf,
smartlist_free(opened_files);
}
or_options_free(newdefaultoptions);
or_options_free(newoptions);
if (*msg) {
char *old_msg = *msg;
tor_asprintf(msg, "Failed to parse/validate config: %s", old_msg);