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

Routerset config parsing: represent empty sets as NULL.

Browse Source 
routerset_t has two representations of an empty routerset: NULL, and
a set containing no elements.  But some of our config code assumes
that empty routersets are represented as NULL.  So let's give it
what it assumes.

Fixes bug 31495. Bugfix on e16b90b88a76; but not in any released
Tor.
This commit is contained in:
Nick Mathewson 2019-08-28 11:51:16 -04:00
parent 35e978da61
commit 2074fed664
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/feature/nodelist/routerset.c
View File

@ -479,6 +479,10 @@ routerset_kv_parse(void *target, const config_line_t *line, char **errmsg,
*errmsg = tor_strdup("Invalid router list."); *errmsg = tor_strdup("Invalid router list.");
return -1; return -1;
} else { } else {
if (routerset_is_empty(rs)) {
/* Represent empty sets as NULL. */
routerset_free(rs);
}
*p = rs; *p = rs;
return 0; return 0;
} }
@ -507,8 +511,10 @@ routerset_copy(void *dest, const void *src, const void *params)
routerset_t **output = (routerset_t**)dest; routerset_t **output = (routerset_t**)dest;
const routerset_t *input = *(routerset_t**)src; const routerset_t *input = *(routerset_t**)src;
routerset_free(*output); // sets *output to NULL routerset_free(*output); // sets *output to NULL
*output = routerset_new(); if (! routerset_is_empty(input)) {
routerset_union(*output, input); *output = routerset_new();
routerset_union(*output, input);
}
return 0; return 0;
} }