commit 9cf08b6bea66a801506f66193389822d3049c112
author Robbie Shade <rjshade@google.com> Tue Mar 07 10:34:17 2017 -0500
committer Robbie Shade <rjshade@google.com> Tue Mar 07 13:53:24 2017 -0500
tree 09fb1bbb28bf1bd45b359e80bad627e7fcc66ebc
parent efe7572c72343cdaa865c1e86d29e98ed13b704b

Fix flaky use-after-free in udp_server

src/core/lib/iomgr/udp_server.c

diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c
index 2a1c8d3..d1bcd89 100644
--- a/src/core/lib/iomgr/udp_server.c
+++ b/src/core/lib/iomgr/udp_server.c
@@ -485,7 +485,11 @@
                       grpc_schedule_on_exec_ctx);
     grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure);
 
-    s->active_ports++;
+    /* Registered for both read and write callbacks: increment active_ports
+     * twice to account for this, and delay free-ing of memory until both
+     * on_read and on_write have fired. */
+    s->active_ports += 2;
+
     sp = sp->next;
   }
 

third_party/gflags

diff --git a/third_party/gflags b/third_party/gflags
index 30dbc81..f8a0efe 160000
--- a/third_party/gflags
+++ b/third_party/gflags
@@ -1 +1 @@
-Subproject commit 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e
+Subproject commit f8a0efe03aa69b3336d8e228b37d4ccb17324b88