diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-17 10:21:43 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-17 10:21:43 -0800 |
| commit | 3975768bdbbbf2d8911d1d098f235bfb8448f30e (patch) | |
| tree | b7ce9cd56037334ac71c2d686fd2b8b25e10b623 /src | |
| parent | 6446368d682bcc7ac898b2c76670f86ef4e9c272 (diff) | |
Fix bugs from merge.
Diffstat (limited to 'src')
3 files changed, 3 insertions, 4 deletions
diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c index 4bf04170eb..ff6da0a545 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c @@ -121,7 +121,6 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_closure *notify = c->notify; c->notify = NULL; grpc_exec_ctx_sched(exec_ctx, notify, GRPC_ERROR_REF(error), NULL); - gpr_free(args); } static void on_initial_connect_string_sent(grpc_exec_ctx *exec_ctx, void *arg, diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c index 3cf5417397..add9c3c676 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c @@ -152,7 +152,6 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_tcp_server_unref(exec_ctx, connection_state->server_state->tcp); gpr_free(connection_state); grpc_channel_args_destroy(args->args); - gpr_free(args); } static void on_accept(grpc_exec_ctx *exec_ctx, void *statep, grpc_endpoint *tcp, diff --git a/src/core/lib/security/transport/handshake.c b/src/core/lib/security/transport/handshake.c index f1c0aa7d32..ec40951cbe 100644 --- a/src/core/lib/security/transport/handshake.c +++ b/src/core/lib/security/transport/handshake.c @@ -101,9 +101,10 @@ static void security_handshake_done(grpc_exec_ctx *exec_ctx, grpc_error_free_string(msg); if (h->secure_endpoint != NULL) { grpc_endpoint_shutdown(exec_ctx, h->secure_endpoint); - grpc_endpoint_destroy(exec_ctx, h->secure_endpoint); +// FIXME: clarify who should destroy... +// grpc_endpoint_destroy(exec_ctx, h->secure_endpoint); } else { - grpc_endpoint_destroy(exec_ctx, h->wrapped_endpoint); +// grpc_endpoint_destroy(exec_ctx, h->wrapped_endpoint); } } // Clear out the read buffer before it gets passed to the transport, |