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

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-21 08:36:48 -04:00
commit c389c41292
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug26435 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Fix a memory leak where directory authorities would leak a chunk
of memory for every router descriptor every time they considered
voting. This bug was taking down directory authorities due to
out-of-memory issues. Fixes bug 26435; bugfix on 0.3.3.6.

9
src/or/protover.c
View File

@ -283,9 +283,12 @@ parse_protocol_list(const char *s)
bool
protover_contains_long_protocol_names(const char *s)
{
if (!parse_protocol_list(s))
return true;
return false;
smartlist_t *list = parse_protocol_list(s);
if (!list)
return true; /* yes, has a dangerous name */
SMARTLIST_FOREACH(list, proto_entry_t *, ent, proto_entry_free(ent));
smartlist_free(list);
return false; /* no, looks fine */
}
/**