From: Roger Dingledine <arma@torproject.org>
Date: Sun, 17 May 2009 05:22:29 +0000 (-0400)
Subject: Fix a memory leak when v3 directory authorities load their keys
X-Git-Tag: tor-0.2.1.15-rc~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fa54102188b70b9899035250a9f7c26b843fc91;p=thirdparty%2Ftor.git

Fix a memory leak when v3 directory authorities load their keys
and cert from disk. Bugfix on 0.2.0.1-alpha.
---

diff --git a/ChangeLog b/ChangeLog
index b84da4ceeb..21569d0999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Changes in version 0.2.1.15??? - ????-??-??
       unhappy.  Bugfix on 0.2.0.x.
     - Fix use of freed memory when deciding to mark a non-addable
       descriptor as never-downloadable.  Bugfix on 0.2.1.9-alpha.
+    - Fix a memory leak when v3 directory authorities load their keys
+      and cert from disk. Bugfix on 0.2.0.1-alpha.
 
 
 Changes in version 0.2.1.14-rc - 2009-04-12
diff --git a/src/or/router.c b/src/or/router.c
index 45ea18b14f..da922b7508 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -330,9 +330,6 @@ load_authority_keyset(int legacy, crypto_pk_env_t **key_out,
              "certificate");
     goto done;
   }
-  parsed->cache_info.signed_descriptor_body = cert;
-  parsed->cache_info.signed_descriptor_len = eos-cert;
-  cert = NULL;
 
   if (*key_out)
     crypto_free_pk_env(*key_out);