diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-04-29 17:26:33 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-04-29 17:26:33 -0700 |
| commit | 580987abf03dc075c90e0ea5b787441191be8c95 (patch) | |
| tree | cc1889d1b580b089461e8acbdf7cfcd464a5e9dd /src/core/ext/client_config/subchannel.c | |
| parent | b41363e88eb78123926e760e45a981add977140f (diff) | |
| parent | 90b4a87d3ba78326d7ff523b3412684aa905670e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lr_hook
Diffstat (limited to 'src/core/ext/client_config/subchannel.c')
| -rw-r--r-- | src/core/ext/client_config/subchannel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/client_config/subchannel.c b/src/core/ext/client_config/subchannel.c index 4e6ab8d51a..b94d37de9c 100644 --- a/src/core/ext/client_config/subchannel.c +++ b/src/core/ext/client_config/subchannel.c @@ -644,9 +644,9 @@ static void subchannel_call_destroy(grpc_exec_ctx *exec_ctx, void *call, bool success) { grpc_subchannel_call *c = call; GPR_TIMER_BEGIN("grpc_subchannel_call_unref.destroy", 0); - grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), NULL); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, c->connection, "subchannel_call"); - gpr_free(c); + grpc_connected_subchannel *connection = c->connection; + grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), NULL, c); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, connection, "subchannel_call"); GPR_TIMER_END("grpc_subchannel_call_unref.destroy", 0); } |