summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-30 11:10:03 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-03 08:37:21 -0400
commite94f1b4e0d4b31ed80e2eefb8700f2671817f561 (patch)
treed0cb597b4f617a89c68fe4fccbb19dbb7b851e47
parente23389841c7797615b09ee6457e841b4ed13ea75 (diff)
downloadtor-e94f1b4e0d4b31ed80e2eefb8700f2671817f561.tar.gz
tor-e94f1b4e0d4b31ed80e2eefb8700f2671817f561.zip
Free rsa_ed_crosscert at exit.
Fixes bug 17779; bugfix on 0.2.7.2-alpha.
-rw-r--r--changes/bug177796
-rw-r--r--src/or/routerkeys.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug17779 b/changes/bug17779
new file mode 100644
index 0000000000..0ed2d1224f
--- /dev/null
+++ b/changes/bug17779
@@ -0,0 +1,6 @@
+ o Minor bugfixes (leak at exit):
+ - Fix a small harmless memory leak at exit of the previously unused
+ RSA->Ed identity cross-certificate. Fixes 17779; bugfix on
+ 0.2.7.2-alpha.
+
+
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 060ffd8753..6d3ad40e20 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -1139,9 +1139,12 @@ routerkeys_free_all(void)
tor_cert_free(signing_key_cert);
tor_cert_free(link_cert_cert);
tor_cert_free(auth_key_cert);
+ tor_free(rsa_ed_crosscert);
master_identity_key = master_signing_key = NULL;
current_auth_key = NULL;
signing_key_cert = link_cert_cert = auth_key_cert = NULL;
+ rsa_ed_crosscert = NULL; // redundant
+ rsa_ed_crosscert_len = 0;
}