[tor-commits] [tor/maint-0.2.4] Fix bug 9122: don't allow newdefaultoptions to be NULL

[nickm@xxxxxxxxxxxxxx]

commit ca6aacce16ce057bab71900e078a24fcd63d250f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 24 09:56:25 2013 -0400

    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.
---
 changes/bug9122 |    4 ++++
 src/or/config.c |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug9122 b/changes/bug9122
new file mode 100644
index 0000000..5009da6
--- /dev/null
+++ b/changes/bug9122
@@ -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.
diff --git a/src/or/config.c b/src/or/config.c
index 55d19b8..725190a 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);

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits