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.

svn:r18355

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 32966d4b55..fb6775d05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1bbd483bce..7524e7205a 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2011,6 +2011,9 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
   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;