[or-cvs] r17447: {tor} Backport: Apply rovv's patch for bug 864: avoid null error o (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-12-02 14:16:11 -0500 (Tue, 02 Dec 2008)
New Revision: 17447

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/dirvote.c
Log:
Backport: Apply rovv's patch for bug 864: avoid null error on detached signature handling failure.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-12-02 19:13:23 UTC (rev 17446)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-12-02 19:16:11 UTC (rev 17447)
@@ -4,8 +4,15 @@
       could make gcc generate non-functional binary search code. Bugfix
       on 0.2.0.10-alpha.
     - Build correctly on platforms without socklen_t.
+    - Avoid potential crash on internal error during signature collection.
+      Fixes bug 864.  Patch from rovv.
 
+  o Minor features:
+    - Report the case where all signatures in a detached set are rejected
+      differently than the case where there is an error handling the detached
+      set.
 
+
 Changes in version 0.2.0.32 - 2008-11-20
   o Security fixes:
     - The "User" and "Group" config options did not clear the

Modified: tor/branches/tor-0_2_0-patches/src/or/dirvote.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/dirvote.c	2008-12-02 19:13:23 UTC (rev 17446)
+++ tor/branches/tor-0_2_0-patches/src/or/dirvote.c	2008-12-02 19:16:11 UTC (rev 17447)
@@ -1909,13 +1909,15 @@
     tor_free(pending_consensus_signatures);
     pending_consensus_signatures = new_detached;
     *msg_out = "Signatures added";
+  } else if (r == 0) {
+    *msg_out = "Signatures ignored";
   } else {
     goto err;
   }
 
   goto done;
  err:
-  if (!msg_out)
+  if (!*msg_out)
     *msg_out = "Unrecognized error while adding detached signatures.";
  done:
   if (sigs)