[or-cvs] r13129: Fix a bogus free() call on a base64 failure in router_append (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-01-14 14:00:19 -0500 (Mon, 14 Jan 2008)
New Revision: 13129

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerparse.c
Log:
 r17610 at catbus:  nickm | 2008-01-14 13:20:49 -0500
 Fix a bogus free() call on a base64 failure in router_append_dirobj_signature().



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17610] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-14 19:00:13 UTC (rev 13128)
+++ tor/trunk/ChangeLog	2008-01-14 19:00:19 UTC (rev 13129)
@@ -43,6 +43,7 @@
     - Do not try to download missing certificates until we have tried
       to check our fallback consensus.  Fixes bug 583.
     - Make bridges round geoip info up, not down.
+    - Avoid a spurious free on base64 failure.  Bugfix on 0.1.2.
 
   o Minor features (controller):
     - Get NS events working again.  (Patch from tup)

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2008-01-14 19:00:13 UTC (rev 13128)
+++ tor/trunk/src/or/routerparse.c	2008-01-14 19:00:19 UTC (rev 13129)
@@ -521,7 +521,6 @@
   i = strlen(buf);
   if (base64_encode(buf+i, buf_len-i, signature, 128) < 0) {
     log_warn(LD_BUG,"couldn't base64-encode signature");
-    tor_free(buf);
     goto err;
   }