diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-14 10:48:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-14 10:48:01 -0400 |
| commit | 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385 (patch) | |
| tree | d7bd66f3b9bf1660e0728fc19d389ea3d2b673ca | |
| parent | 82b128277203b86f35739a424787bbb268a6cdeb (diff) | |
| parent | 281854bab7001cc838c91b521b41b666140e124f (diff) | |
| download | tor-8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385.tar.gz tor-8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | changes/bug27708 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug27708 b/changes/bug27708 new file mode 100644 index 0000000000..d283b19515 --- /dev/null +++ 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 index b0e66ccd26..2660fbd787 100644 --- 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 |