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

Merge branch 'bug23479'

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-12 09:24:54 -04:00
commit 80a22f536a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/config.c
View File

@ -2313,17 +2313,18 @@ options_trial_assign(config_line_t *list, unsigned flags, char **msg)
} }
setopt_err_t rv; setopt_err_t rv;
or_options_t *cur_options = get_options_mutable();
in_option_validation = 1; in_option_validation = 1;
if (options_validate(get_options_mutable(), trial_options, if (options_validate(cur_options, trial_options,
global_default_options, 1, msg) < 0) { global_default_options, 1, msg) < 0) {
or_options_free(trial_options); or_options_free(trial_options);
rv = SETOPT_ERR_PARSE; /*XXX make this a separate return value. */ rv = SETOPT_ERR_PARSE; /*XXX make this a separate return value. */
goto done; goto done;
} }
if (options_transition_allowed(get_options(), trial_options, msg) < 0) { if (options_transition_allowed(cur_options, trial_options, msg) < 0) {
or_options_free(trial_options); or_options_free(trial_options);
rv = SETOPT_ERR_TRANSITION; rv = SETOPT_ERR_TRANSITION;
goto done; goto done;