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 | 7e406ec40f5fef21c07bea9db51615e11a749ee8 (patch) | |
| tree | 970f3cafb9380d4b65cf4671a21f21db9a6bd366 | |
| parent | 0e4fcd39966ac6f5273920a6a19a8527d891d78e (diff) | |
| parent | 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385 (diff) | |
| download | tor-7e406ec40f5fef21c07bea9db51615e11a749ee8.tar.gz tor-7e406ec40f5fef21c07bea9db51615e11a749ee8.zip | |
Merge branch 'maint-0.3.4'
| -rw-r--r-- | changes/bug27708 | 4 | ||||
| -rw-r--r-- | src/app/config/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/app/config/config.c b/src/app/config/config.c index a557a2adbe..253d7ac9e8 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -911,6 +911,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 |