[tor-commits] [tor/release-0.2.7] Fix a memory leak in reading an expired ed signing key.

[nickm at torproject.org]

commit 9c4a0aef0c0d8e1c3ad8d9ed7b655eae8a175ccb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 11:16:28 2015 -0400

    Fix a memory leak in reading an expired ed signing key.
    
    Closes 17403.
---
 changes/bug17403    |    3 +++
 src/or/routerkeys.c |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug17403 b/changes/bug17403
new file mode 100644
index 0000000..e83a4a2
--- /dev/null
+++ b/changes/bug17403
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory leaks):
+    - Fix a memory leak when reading an expired signing key from disk.
+      Fixes bug 17403; bugfix on 0.2.7.2-rc.
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 765dac8..d88bfca 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now)
                       INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);
     char *fname =
       options_get_datadir_fname2(options, "keys", "ed25519_signing");
+    ed25519_keypair_free(sign);
+    tor_cert_free(sign_cert);
     sign = ed_key_init_from_file(fname,
                                  flags, LOG_WARN,
                                  sign_signing_key_with_id, now,