Fix a possible cause of bug 915 when parsing multiple votes one of which was bad. Bugfix on 0.2.0.8-alpha.

svn:r18354
This commit is contained in:
Nick Mathewson 2009-01-31 18:27:38 +00:00
parent 676cfbbf84
commit 261f49fe26
2 changed files with 7 additions and 0 deletions

View File

@ -1,4 +1,8 @@
Changes in version 0.2.1.12-alpha - 2009-02-?? Changes in version 0.2.1.12-alpha - 2009-02-??
o Major bugfixes:
- Fix an infinite-loop bug on handling corrupt votes under certain
circumstances. Bugfix on 0.2.0.8-alpha.
o Minor bugfixes: o Minor bugfixes:
- Let controllers actually ask for the "clients_seen" event. Bugfix - Let controllers actually ask for the "clients_seen" event. Bugfix
on 0.2.1.10-alpha; reported by Matt Edman. on 0.2.1.10-alpha; reported by Matt Edman.

View File

@ -2167,6 +2167,9 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
memarea_t *area = NULL, *rs_area = NULL; memarea_t *area = NULL, *rs_area = NULL;
tor_assert(s); tor_assert(s);
if (eos_out)
*eos_out = NULL;
if (router_get_networkstatus_v3_hash(s, ns_digest)) { if (router_get_networkstatus_v3_hash(s, ns_digest)) {
log_warn(LD_DIR, "Unable to compute digest of network-status"); log_warn(LD_DIR, "Unable to compute digest of network-status");
goto err; goto err;