[or-cvs] r17997: {tor} When parsing routerstatus lines in votes, use previously def (tor/branches/tor-0_2_0-patches/src/or)

[kloesing at seul.org]

Author: kloesing
Date: 2009-01-07 06:24:49 -0500 (Wed, 07 Jan 2009)
New Revision: 17997

Modified:
   tor/branches/tor-0_2_0-patches/src/or/routerparse.c
Log:
When parsing routerstatus lines in votes, use previously defined smartlist rs_tokens instead of tokens. Pointed out by multiplication_.

Modified: tor/branches/tor-0_2_0-patches/src/or/routerparse.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/routerparse.c	2009-01-07 02:41:07 UTC (rev 17996)
+++ tor/branches/tor-0_2_0-patches/src/or/routerparse.c	2009-01-07 11:24:49 UTC (rev 17997)
@@ -2245,7 +2245,7 @@
   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 @@
       }
     } 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);
     }