Fix bug 9122: don't allow newdefaultoptions to be NULL

(This caused a crash that was reported as bug 9122, but the underlying
behavior has been wrong for a while.)

Fix on 0.2.3.9-alpha.
This commit is contained in:
Nick Mathewson 2013-06-24 09:56:25 -04:00
parent 7c4544e5a4
commit ca6aacce16
2 changed files with 8 additions and 0 deletions

4
changes/bug9122 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- When receiving a new configuration file via the control port's
LOADCONF command, do not treat the defaults file as absent.
Fixes bug 9122; bugfix on 0.2.3.9-alpha.

View File

@ -3785,6 +3785,10 @@ options_init_from_string(const char *cf_defaults, const char *cf,
newdefaultoptions = config_dup(&options_format, newoptions);
}
if (newdefaultoptions == NULL) {
newdefaultoptions = config_dup(&options_format, global_default_options);
}
/* Go through command-line variables too */
retval = config_assign(&options_format, newoptions,
global_cmdline_options, 0, 0, msg);