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

or_state_validate() needs an extra arg too or it will crash

Browse Source 
svn:r5772
This commit is contained in:
Roger Dingledine 2006-01-10 20:38:33 +00:00
parent f4299f0f44
commit b2d79f278b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -358,7 +358,8 @@ static int write_configuration_file(const char *fname, or_options_t *options);
static config_line_t *get_assigned_option(config_format_t *fmt, static config_line_t *get_assigned_option(config_format_t *fmt,
or_options_t *options, const char *key); or_options_t *options, const char *key);
static void config_init(config_format_t *fmt, void *options); static void config_init(config_format_t *fmt, void *options);
static int or_state_validate(or_state_t *old_options, or_state_t *options); static int or_state_validate(or_state_t *old_options, or_state_t *options,
int from_setconf);
static uint64_t config_parse_memunit(const char *s, int *ok); static uint64_t config_parse_memunit(const char *s, int *ok);
static int config_parse_interval(const char *s, int *ok); static int config_parse_interval(const char *s, int *ok);
@ -3562,8 +3563,9 @@ get_or_state_fname(void)
} }
/** DOCDOC */ /** DOCDOC */
/* XXX from_setconf is here because of bug 238 */
static int static int
or_state_validate(or_state_t *old_state, or_state_t *state) or_state_validate(or_state_t *old_state, or_state_t *state, int from_setconf)
{ {
const char *err; const char *err;
tor_version_t v; tor_version_t v;
@ -3629,7 +3631,7 @@ or_state_load(void)
goto done; goto done;
} }
if (or_state_validate(NULL, new_state) < 0) if (or_state_validate(NULL, new_state, 1) < 0)
goto done; goto done;
if (contents) if (contents)