diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-05-31 14:06:01 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-05-31 14:19:57 -0700 |
| commit | 4594bd9d1b966e33d27396eb015f289eba82f443 (patch) | |
| tree | fa1a65ab679c309d227b5cb493452da632c5c983 /src/core/ext/client_config/client_channel.c | |
| parent | 886b3441441768216d8cb61ec63b8f974833c931 (diff) | |
| parent | 0d6196025e62aea5aabc6341459f2c370e264230 (diff) | |
Merge remote-tracking branch 'upstream/master' into base
Diffstat (limited to 'src/core/ext/client_config/client_channel.c')
| -rw-r--r-- | src/core/ext/client_config/client_channel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c index 8a98a6bcbe..9b5a078aec 100644 --- a/src/core/ext/client_config/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -415,9 +415,10 @@ static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + void *and_free_memory) { grpc_subchannel_call_holder_destroy(exec_ctx, elem->call_data); + gpr_free(and_free_memory); } /* Constructor for channel_data */ |