Merge pull request #34 from markdroth/error

Fix memory leak.
pull/6897/head
Craig Tiller 9 years ago
commit 3b03f8b378
  1. 4
      src/core/lib/iomgr/tcp_posix.c

@ -371,7 +371,7 @@ static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */,
if (error != GRPC_ERROR_NONE) { if (error != GRPC_ERROR_NONE) {
cb = tcp->write_cb; cb = tcp->write_cb;
tcp->write_cb = NULL; tcp->write_cb = NULL;
cb->cb(exec_ctx, cb->cb_arg, GRPC_ERROR_REF(error)); cb->cb(exec_ctx, cb->cb_arg, error);
TCP_UNREF(exec_ctx, tcp, "write"); TCP_UNREF(exec_ctx, tcp, "write");
return; return;
} }
@ -382,7 +382,7 @@ static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */,
cb = tcp->write_cb; cb = tcp->write_cb;
tcp->write_cb = NULL; tcp->write_cb = NULL;
GPR_TIMER_BEGIN("tcp_handle_write.cb", 0); GPR_TIMER_BEGIN("tcp_handle_write.cb", 0);
cb->cb(exec_ctx, cb->cb_arg, GRPC_ERROR_REF(error)); cb->cb(exec_ctx, cb->cb_arg, error);
GPR_TIMER_END("tcp_handle_write.cb", 0); GPR_TIMER_END("tcp_handle_write.cb", 0);
TCP_UNREF(exec_ctx, tcp, "write"); TCP_UNREF(exec_ctx, tcp, "write");
GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(error);

Loading…
Cancel
Save