summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-05-17 01:22:29 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-17 02:04:59 -0400
commit2fa54102188b70b9899035250a9f7c26b843fc91 (patch)
treeb140db62acf5ab4d785ab52afb57e323668f6cc2
parentc0515b307c4c60d4a17158e47db1033540019b28 (diff)
downloadtor-2fa54102188b70b9899035250a9f7c26b843fc91.tar.gz
tor-2fa54102188b70b9899035250a9f7c26b843fc91.zip
Fix a memory leak when v3 directory authorities load their keys
and cert from disk. Bugfix on 0.2.0.1-alpha.
-rw-r--r--ChangeLog2
-rw-r--r--src/or/router.c3
2 files changed, 2 insertions, 3 deletions
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);