Avoid possible segfault when handling networkstatus vote with bad flavor

Fix for 6530; fix on 0.2.2.6-alpha.
This commit is contained in:
Nick Mathewson 2012-08-03 10:53:00 -04:00
parent 4e7552e552
commit 57e35ad3d9
2 changed files with 5 additions and 1 deletions

4
changes/bug6530 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- Avoid a read of uninitializd RAM when reading a vote or consensus
document with an unrecognized flavor name. Fixes bug 6530; bugfix on
0.2.2.6-alpha.

View File

@ -2821,7 +2821,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
int flavor = networkstatus_parse_flavor_name(tok->args[1]);
if (flavor < 0) {
log_warn(LD_DIR, "Can't parse document with unknown flavor %s",
escaped(tok->args[2]));
escaped(tok->args[1]));
goto err;
}
ns->flavor = flav = flavor;