From ca6aacce16ce057bab71900e078a24fcd63d250f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 24 Jun 2013 09:56:25 -0400 Subject: 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. --- src/or/config.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/or/config.c b/src/or/config.c index 55d19b8e26..725190a96d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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); -- cgit v1.2.3-54-g00ecf