diff options
author | Yang Gao <yangg@google.com> | 2017-03-07 14:07:53 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-07 14:07:53 -0800 |
commit | 7c1aafb3f9dbc284f2041773002379c9def00f72 (patch) | |
tree | eca277745dd3497b5ef0920cb332d43bb2dd779e | |
parent | 73c33541b5eaf6a44e0e14e1382ab19f25538873 (diff) |
Revert "Fix flaky use-after-free in udp_server"
-rw-r--r-- | src/core/lib/iomgr/udp_server.c | 6 | ||||
m--------- | third_party/gflags | 0 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c index d1bcd89af1..2a1c8d39fa 100644 --- a/src/core/lib/iomgr/udp_server.c +++ b/src/core/lib/iomgr/udp_server.c @@ -485,11 +485,7 @@ void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, grpc_schedule_on_exec_ctx); grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); - /* 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; - + s->active_ports++; sp = sp->next; } diff --git a/third_party/gflags b/third_party/gflags -Subproject f8a0efe03aa69b3336d8e228b37d4ccb17324b8 +Subproject 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26 |