[or-cvs] r18355: {tor} Backport r18354: Fix a possible cause of bug 915 when parsin (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-01-31 13:28:22 -0500 (Sat, 31 Jan 2009)
New Revision: 18355

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/routerparse.c
Log:
Backport r18354: Fix a possible cause of bug 915 when parsing multiple votes one of which was bad.  Bugfix on 0.2.0.8-alpha.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-31 18:27:38 UTC (rev 18354)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-31 18:28:22 UTC (rev 18355)
@@ -1,4 +1,8 @@
 Changes in version 0.2.0.34 - 2009-??-??
+  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:
     - Fix compilation on systems where time_t is a 64-bit integer.
       Patch from Matthias Drochner.

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-31 18:27:38 UTC (rev 18354)
+++ tor/branches/tor-0_2_0-patches/src/or/routerparse.c	2009-01-31 18:28:22 UTC (rev 18355)
@@ -2011,6 +2011,9 @@
   struct in_addr in;
   int i, inorder, n_signatures = 0;
 
+  if (eos_out)
+    *eos_out = NULL;
+
   if (router_get_networkstatus_v3_hash(s, ns_digest)) {
     log_warn(LD_DIR, "Unable to compute digest of network-status");
     goto err;