From e8863d006499939afcc2d4579d6f5ef647e295ae Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Thu, 7 Nov 2019 22:10:07 -0800
Subject: [PATCH] Fix new & delete match

---
 .../composite/composite_credentials.cc        |  2 +-
 test/core/gprpp/mpscq_test.cc                 |  6 ++---
 test/cpp/client/credentials_test.cc           | 26 +++++++------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc
index d35a4c27359..a2c0bebf871 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.cc
+++ b/src/core/lib/security/credentials/composite/composite_credentials.cc
@@ -82,7 +82,7 @@ static void composite_call_metadata_cb(void* arg, grpc_error* error) {
   }
   grpc_core::ExecCtx::Run(DEBUG_LOCATION, ctx->on_request_metadata,
                           GRPC_ERROR_REF(error));
-  gpr_free(ctx);
+  delete ctx;
 }
 
 bool grpc_composite_call_credentials::get_request_metadata(
diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/gprpp/mpscq_test.cc
index d19a362f279..2c1760f58a0 100644
--- a/test/core/gprpp/mpscq_test.cc
+++ b/test/core/gprpp/mpscq_test.cc
@@ -54,7 +54,7 @@ static void test_serial(void) {
     test_node* n = reinterpret_cast<test_node*>(q.Pop());
     GPR_ASSERT(n);
     GPR_ASSERT(n->i == i);
-    gpr_free(n);
+    delete n;
   }
 }
 
@@ -100,7 +100,7 @@ static void test_mt(void) {
     GPR_ASSERT(*tn->ctr == tn->i - 1);
     *tn->ctr = tn->i;
     if (tn->i == THREAD_ITERATIONS) num_done++;
-    gpr_free(tn);
+    delete tn;
   }
   gpr_log(GPR_DEBUG, "spins: %" PRIdPTR, spins);
   for (auto& th : thds) {
@@ -136,7 +136,7 @@ static void pull_thread(void* arg) {
     GPR_ASSERT(*tn->ctr == tn->i - 1);
     *tn->ctr = tn->i;
     if (tn->i == THREAD_ITERATIONS) pa->num_done++;
-    gpr_free(tn);
+    delete tn;
     gpr_mu_unlock(&pa->mu);
   }
 }
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc
index 8b263b03e2e..f0ad9927a98 100644
--- a/test/cpp/client/credentials_test.cc
+++ b/test/cpp/client/credentials_test.cc
@@ -288,10 +288,7 @@ TEST_F(CredentialsTest, TlsKeyMaterialsConfigCppToC) {
                c_config->pem_key_cert_pair_list()[0].private_key());
   EXPECT_STREQ(pair.cert_chain.c_str(),
                c_config->pem_key_cert_pair_list()[0].cert_chain());
-  gpr_free(c_config->pem_key_cert_pair_list()[0].private_key());
-  gpr_free(c_config->pem_key_cert_pair_list()[0].cert_chain());
-  gpr_free(const_cast<char*>(c_config->pem_root_certs()));
-  gpr_free(c_config);
+  delete c_config;
 }
 
 TEST_F(CredentialsTest, TlsKeyMaterialsModifiers) {
@@ -371,8 +368,8 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigSchedule) {
   if (c_arg->destroy_context != nullptr) {
     c_arg->destroy_context(c_arg->context);
   }
-  gpr_free(c_arg);
-  gpr_free(config->c_config());
+  delete c_arg;
+  delete config->c_config();
 }
 
 TEST_F(CredentialsTest, TlsCredentialReloadConfigCppToC) {
@@ -423,7 +420,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigCppToC) {
 
   // Cleanup.
   c_arg.destroy_context(c_arg.context);
-  ::delete config.c_config();
+  delete config.c_config();
 }
 
 typedef class ::grpc_impl::experimental::TlsServerAuthorizationCheckArg
@@ -507,8 +504,8 @@ TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigSchedule) {
   if (c_arg->destroy_context != nullptr) {
     c_arg->destroy_context(c_arg->context);
   }
-  gpr_free(c_arg);
-  gpr_free(config.c_config());
+  delete c_arg;
+  delete config.c_config();
 }
 
 TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigCppToC) {
@@ -540,7 +537,7 @@ TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigCppToC) {
   gpr_free(const_cast<char*>(c_arg.error_details));
   gpr_free(const_cast<char*>(c_arg.target_name));
   gpr_free(const_cast<char*>(c_arg.peer_cert));
-  gpr_free(config.c_config());
+  delete config.c_config();
 }
 
 typedef class ::grpc_impl::experimental::TlsCredentialsOptions
@@ -640,7 +637,6 @@ TEST_F(CredentialsTest, TlsCredentialsOptionsCppToC) {
                "sync_error_details");
 
   // Cleanup.
-  ::delete c_credential_reload_arg.key_materials_config;
   c_credential_reload_arg.destroy_context(c_credential_reload_arg.context);
   c_server_authorization_check_arg.destroy_context(
       c_server_authorization_check_arg.context);
@@ -648,9 +644,7 @@ TEST_F(CredentialsTest, TlsCredentialsOptionsCppToC) {
   gpr_free(const_cast<char*>(c_server_authorization_check_arg.target_name));
   gpr_free(const_cast<char*>(c_server_authorization_check_arg.peer_cert));
   gpr_free(const_cast<char*>(c_server_authorization_check_arg.error_details));
-  ::delete c_credential_reload_config;
-  ::delete c_server_authorization_check_config;
-  gpr_free(c_options);
+  delete c_options;
 }
 
 // This test demonstrates how the SPIFFE credentials will be used.
@@ -700,7 +694,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigErrorMessages) {
     c_arg->destroy_context(c_arg->context);
   }
   delete c_arg;
-  gpr_free(config->c_config());
+  delete config->c_config();
 }
 
 TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigErrorMessages) {
@@ -733,7 +727,7 @@ TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigErrorMessages) {
     c_arg->destroy_context(c_arg->context);
   }
   delete c_arg;
-  gpr_free(config->c_config());
+  delete config->c_config();
 }
 
 }  // namespace testing