From 19d653d4ffb697570c29595c7b28c3623ed389d7 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Wed, 8 Dec 2021 15:09:59 -0800
Subject: [PATCH] TSI: free the fixture in destruct() instead of in
 tsi_test_fixture_destroy() (#28312)

---
 test/core/tsi/fake_transport_security_test.cc | 2 +-
 test/core/tsi/ssl_transport_security_test.cc  | 1 +
 test/core/tsi/transport_security_test_lib.cc  | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc
index 9e1aaf20b3f..4f7de6c889c 100644
--- a/test/core/tsi/fake_transport_security_test.cc
+++ b/test/core/tsi/fake_transport_security_test.cc
@@ -64,7 +64,7 @@ static void fake_test_check_handshaker_peers(tsi_test_fixture* fixture) {
   validate_handshaker_peers(fixture->server_result);
 }
 
-static void fake_test_destruct(tsi_test_fixture* /*fixture*/) {}
+static void fake_test_destruct(tsi_test_fixture* fixture) { gpr_free(fixture); }
 
 static const struct tsi_test_fixture_vtable vtable = {
     fake_test_setup_handshakers, fake_test_check_handshaker_peers,
diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index ea8e4b58bdf..ab2ca5cb489 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -415,6 +415,7 @@ static void ssl_test_destruct(tsi_test_fixture* fixture) {
       ssl_fixture->server_handshaker_factory);
   tsi_ssl_client_handshaker_factory_unref(
       ssl_fixture->client_handshaker_factory);
+  gpr_free(ssl_fixture);
 }
 
 static const struct tsi_test_fixture_vtable vtable = {
diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc
index 6548af3dbb1..875919ca984 100644
--- a/test/core/tsi/transport_security_test_lib.cc
+++ b/test/core/tsi/transport_security_test_lib.cc
@@ -628,10 +628,9 @@ void tsi_test_fixture_destroy(tsi_test_fixture* fixture) {
   tsi_test_channel_destroy(fixture->channel);
   GPR_ASSERT(fixture->vtable != nullptr);
   GPR_ASSERT(fixture->vtable->destruct != nullptr);
-  fixture->vtable->destruct(fixture);
   gpr_mu_destroy(&fixture->mu);
   gpr_cv_destroy(&fixture->cv);
-  gpr_free(fixture);
+  fixture->vtable->destruct(fixture);
 }
 
 tsi_test_frame_protector_fixture* tsi_test_frame_protector_fixture_create() {