summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2009-01-07 11:24:49 +0000
committerKarsten Loesing <karsten.loesing@gmx.net>2009-01-07 11:24:49 +0000
commite600b87e75bbdca3434a5798f01d909ec60105d1 (patch)
tree610f5d7fd06646185f84257782c86bf245282b35
parent243ded6b578938dcf64fab7b28d0afee84500fbc (diff)
downloadtor-e600b87e75bbdca3434a5798f01d909ec60105d1.tar.gz
tor-e600b87e75bbdca3434a5798f01d909ec60105d1.zip
When parsing routerstatus lines in votes, use previously defined smartlist rs_tokens instead of tokens. Pointed out by multiplication_.
svn:r17997
-rw-r--r--src/or/routerparse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 7675ef5a83..1bbd483bce 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2245,7 +2245,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
while (!strcmpstart(s, "r ")) {
if (is_vote) {
vote_routerstatus_t *rs = tor_malloc_zero(sizeof(vote_routerstatus_t));
- if (routerstatus_parse_entry_from_string(&s, tokens, ns, rs, 0))
+ if (routerstatus_parse_entry_from_string(&s, rs_tokens, ns, rs, 0))
smartlist_add(ns->routerstatus_list, rs);
else {
tor_free(rs->version);
@@ -2253,7 +2253,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
}
} else {
routerstatus_t *rs;
- if ((rs = routerstatus_parse_entry_from_string(&s, tokens, NULL, NULL,
+ if ((rs = routerstatus_parse_entry_from_string(&s, rs_tokens, NULL, NULL,
ns->consensus_method)))
smartlist_add(ns->routerstatus_list, rs);
}