From ec0669c8a27893e582fd498624dbee57f7a2ca49 Mon Sep 17 00:00:00 2001
From: Zhouyihai Ding <ddyihai@google.com>
Date: Tue, 23 Jan 2018 20:43:53 -0800
Subject: [PATCH] php: call credentials plugin_get_metadata metadata leak

---
 src/php/ext/grpc/call.c             | 4 +++-
 src/php/ext/grpc/call_credentials.c | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/php/ext/grpc/call.c b/src/php/ext/grpc/call.c
index 115358d600d..ff55c3cbfaf 100644
--- a/src/php/ext/grpc/call.c
+++ b/src/php/ext/grpc/call.c
@@ -128,10 +128,12 @@ bool create_metadata_array(zval *array, grpc_metadata_array *metadata) {
   HashTable *inner_array_hash;
   zval *value;
   zval *inner_array;
+  grpc_metadata_array_init(metadata);
+  metadata->count = 0;
+  metadata->metadata = NULL;
   if (Z_TYPE_P(array) != IS_ARRAY) {
     return false;
   }
-  grpc_metadata_array_init(metadata);
   array_hash = Z_ARRVAL_P(array);
 
   char *key;
diff --git a/src/php/ext/grpc/call_credentials.c b/src/php/ext/grpc/call_credentials.c
index a37eb601c41..41c488a79cd 100644
--- a/src/php/ext/grpc/call_credentials.c
+++ b/src/php/ext/grpc/call_credentials.c
@@ -195,6 +195,7 @@ int plugin_get_metadata(
   if (!create_metadata_array(retval, &metadata)) {
     *status = GRPC_STATUS_INVALID_ARGUMENT;
     should_return = true;  // Synchronous return.
+    grpc_php_metadata_array_destroy_including_entries(&metadata);
   }
 
   if (retval != NULL) {