From ea6e8a65a216d9645569bb244a287352ace38fd2 Mon Sep 17 00:00:00 2001
From: David Klempner <klempner@google.com>
Date: Mon, 2 Feb 2015 13:13:01 -0800
Subject: [PATCH] Fix poll_kick_posix_test under asan

1. Init the freelist_mu in the forced-fallback path
2. Free allocated memory in the test_over_free test case.
---
 src/core/iomgr/pollset_kick.c          | 1 +
 test/core/iomgr/poll_kick_posix_test.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/core/iomgr/pollset_kick.c b/src/core/iomgr/pollset_kick.c
index 42b110d1241..238ec75c61c 100644
--- a/src/core/iomgr/pollset_kick.c
+++ b/src/core/iomgr/pollset_kick.c
@@ -138,6 +138,7 @@ void grpc_pollset_kick_kick(grpc_pollset_kick_state *kick_state) {
 }
 
 void grpc_pollset_kick_global_init_fallback_fd(void) {
+  gpr_mu_init(&fd_freelist_mu);
   grpc_wakeup_fd_global_init_force_fallback();
 }
 
diff --git a/test/core/iomgr/poll_kick_posix_test.c b/test/core/iomgr/poll_kick_posix_test.c
index 3c6d815c9de..2c5b444d3ae 100644
--- a/test/core/iomgr/poll_kick_posix_test.c
+++ b/test/core/iomgr/poll_kick_posix_test.c
@@ -105,6 +105,7 @@ static void test_over_free(void) {
     grpc_pollset_kick_post_poll(&kick_state[i]);
     grpc_pollset_kick_destroy(&kick_state[i]);
   }
+  gpr_free(kick_state);
 }
 
 static void run_tests(void) {