Commit bbc75fae authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.0' into maint-0.3.1

parents 66258f88 c1afbbe8

changes/bug22803

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test_link_handshake.c

+3 −1
Original line number Diff line number Diff line
@@ -234,6 +234,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);
@@ -297,7 +298,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));