tor

commit c1afbbe8feff1b803f721079b59a00438676045e
parent 66c85cd8812c7d862edafc03b8e04bf3555733a3
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 14 Jul 2017 09:06:33 -0400

Merge branch 'bug22803_030' into maint-0.3.0

Diffstat:
A
changes/bug22803
 | 
3
+++
M
src/test/test_link_handshake.c
 | 
4
+++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug22803 b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+    - Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+      Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));