diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-16 15:25:16 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-16 15:25:16 -0800 |
| commit | 9fa2ec6de2798398b8622e1af6ff7ec3a571eb0e (patch) | |
| tree | 5a2febe90444702805de185a7d4ff902a6e3302c /src/core/lib/slice | |
| parent | c586666cbdfc5b5f2a3306892f8b4491862c5aba (diff) | |
| parent | 3cf79228ffcdd5c867b4067d6f6a5743a14d3ff1 (diff) | |
Merge branch 'slice_with_exec_ctx' of github.com:ctiller/grpc into slice_with_exec_ctx
Diffstat (limited to 'src/core/lib/slice')
| -rw-r--r-- | src/core/lib/slice/slice_buffer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/lib/slice/slice_buffer.c b/src/core/lib/slice/slice_buffer.c index 872bd10a09..08eaf4963a 100644 --- a/src/core/lib/slice/slice_buffer.c +++ b/src/core/lib/slice/slice_buffer.c @@ -75,10 +75,7 @@ void grpc_slice_buffer_destroy_internal(grpc_exec_ctx *exec_ctx, void grpc_slice_buffer_destroy(grpc_slice_buffer *sb) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, sb); - if (sb->slices != sb->inlined) { - gpr_free(sb->slices); - } + grpc_slice_buffer_destroy_internal(&exec_ctx, sb); grpc_exec_ctx_finish(&exec_ctx); } |