mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Correctly remove extraneous space in router family lines

Browse source 
Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE
option was added.
This commit is contained in:
Nick Mathewson 2014-08-05 11:09:08 -04:00
parent fcbb21b414
commit 04007448b9
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug12728 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes:
- When generating our family list, remove spaces from around the
entries there. Fixes bug 12728; bugfix on 0.2.1.7-alpha.

2
src/or/router.c
View file

@ -1884,7 +1884,7 @@ router_rebuild_descriptor(int force)
family = smartlist_new(); family = smartlist_new();
ri->declared_family = smartlist_new(); ri->declared_family = smartlist_new();
smartlist_split_string(family, options->MyFamily, ",", smartlist_split_string(family, options->MyFamily, ",",
SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0);
SMARTLIST_FOREACH_BEGIN(family, char *, name) { SMARTLIST_FOREACH_BEGIN(family, char *, name) {
const node_t *member; const node_t *member;
if (!strcasecmp(name, options->Nickname)) if (!strcasecmp(name, options->Nickname))