nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-14 10:48:01 -04:00
commit 7e406ec40f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug27708 Normal file
View File

@ -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.

1
src/app/config/config.c
View File

@ -911,6 +911,7 @@ set_options(or_options_t *new_val, char **msg)
"Acting on config options left us in a broken state. Dying."); "Acting on config options left us in a broken state. Dying.");
tor_shutdown_event_loop_and_exit(1); tor_shutdown_event_loop_and_exit(1);
} }
global_options = old_options;
return -1; return -1;
} }
/* Issues a CONF_CHANGED event to notify controller of the change. If Tor is /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is