diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-01 10:30:11 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-01 10:30:11 -0700 |
| commit | ee090ec9759fdef474a9a58d7c816676b9bfe6f1 (patch) | |
| tree | 96d6eed3791596180f93831205dc048d1e8ec47b /src/core/lib/transport | |
| parent | 0f2f4eea4bdc32c7e229feba1d8867d4b6628185 (diff) | |
| parent | b2b9a0ff7eacc84335b800e31b13a7607acf614b (diff) | |
Merge github.com:grpc/grpc into wc
Diffstat (limited to 'src/core/lib/transport')
| -rw-r--r-- | src/core/lib/transport/byte_stream.c | 1 | ||||
| -rw-r--r-- | src/core/lib/transport/byte_stream.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/lib/transport/byte_stream.c b/src/core/lib/transport/byte_stream.c index fb03a10315..08f61629a9 100644 --- a/src/core/lib/transport/byte_stream.c +++ b/src/core/lib/transport/byte_stream.c @@ -85,6 +85,7 @@ static void slice_buffer_stream_shutdown(grpc_exec_ctx *exec_ctx, static void slice_buffer_stream_destroy(grpc_exec_ctx *exec_ctx, grpc_byte_stream *byte_stream) { grpc_slice_buffer_stream *stream = (grpc_slice_buffer_stream *)byte_stream; + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, stream->backing_buffer); GRPC_ERROR_UNREF(stream->shutdown_error); } diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index 1e1e8310b8..be2a35213e 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -81,7 +81,9 @@ void grpc_byte_stream_destroy(grpc_exec_ctx *exec_ctx, // grpc_slice_buffer_stream // -// A grpc_byte_stream that wraps a slice buffer. +// A grpc_byte_stream that wraps a slice buffer. The stream takes +// ownership of the slices in the buffer, and on destruction will +// reset the contents of the buffer. typedef struct grpc_slice_buffer_stream { grpc_byte_stream base; |