tor

commit 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385
parent 82b128277203b86f35739a424787bbb268a6cdeb
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 14 Sep 2018 10:48:01 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug27708
 | 
4
++++
M
src/or/config.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/changes/bug27708 b/changes/bug27708
@@ -0,0 +1,4 @@
+  o Major bugfixes (restart-in-process):
+    - Fix a use-after-free error that could be caused by passing Tor an
+      impossible set of options that would fail during options_act().
+      Fixes bug 27708; bugfix on 0.3.3.1-alpha.
diff --git a/src/or/config.c b/src/or/config.c
@@ -874,6 +874,7 @@ set_options(or_options_t *new_val, char **msg)
               "Acting on config options left us in a broken state. Dying.");
       tor_shutdown_event_loop_and_exit(1);
     }
+    global_options = old_options;
     return -1;
   }
   /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is