r17610@catbus: nickm | 2008-01-14 13:20:49 -0500

 Fix a bogus free() call on a base64 failure in router_append_dirobj_signature().

svn:r13129

diff --git a/ChangeLog b/ChangeLog
index bd0e01bdcb2e38be2e019f29d3ae19a27e462f80..3d92b226c3a31adf39b938aa55968b940c2f0e88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
     - 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)

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index e57077d6604318366078e4ae076abff3859900a4..102bae764172cb4a23f8c9eb93130d8de0fa0fdb 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -521,7 +521,6 @@ router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,
   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;
   }