diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-08-07 11:49:26 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-08-07 11:49:52 -0700 |
| commit | 458214f1ec9bc946236f9be0660105a4c4bacb14 (patch) | |
| tree | 92acae6020ea567785f822618d54992affde459e /src/core | |
| parent | 9b5da78be9c5aa1f34cb1a8f4aec4c4731cdf42c (diff) | |
transport - Fix a thread safety bug introduced by #11780
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index aabe7b4a8e..8976686082 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1788,9 +1788,8 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, bool pending_data = s->pending_byte_stream || s->unprocessed_incoming_frames_buffer.length > 0; if (s->stream_compression_recv_enabled && s->read_closed && - s->frame_storage.length > 0 && - s->unprocessed_incoming_frames_buffer.length == 0 && !pending_data && - !s->seen_error && s->recv_trailing_metadata_finished != NULL) { + s->frame_storage.length > 0 && !pending_data && !s->seen_error && + s->recv_trailing_metadata_finished != NULL) { /* Maybe some SYNC_FLUSH data is left in frame_storage. Consume them and * maybe decompress the next 5 bytes in the stream. */ bool end_of_context; @@ -1817,7 +1816,6 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, } } if (s->read_closed && s->frame_storage.length == 0 && - s->unprocessed_incoming_frames_buffer.length == 0 && (!pending_data || s->seen_error) && s->recv_trailing_metadata_finished != NULL) { grpc_chttp2_incoming_metadata_buffer_publish( |