From 306efc787a8a224b4fc5b523fd551f402932d14e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 20 Mar 2017 09:45:12 -0700 Subject: Fix use after clear --- src/core/ext/transport/chttp2/transport/chttp2_transport.c | 3 ++- third_party/gflags | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index b5896893e5..e6a6229272 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1297,7 +1297,8 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, s->send_trailing_metadata = NULL; grpc_chttp2_complete_closure_step( exec_ctx, t, s, &s->send_trailing_metadata_finished, - grpc_metadata_batch_is_empty(s->send_trailing_metadata) + grpc_metadata_batch_is_empty( + op->payload->send_initial_metadata.send_initial_metadata) ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE("Attempt to send trailing metadata after " "stream was closed"), diff --git a/third_party/gflags b/third_party/gflags index f8a0efe03a..30dbc81fb5 160000 --- a/third_party/gflags +++ b/third_party/gflags @@ -1 +1 @@ -Subproject commit f8a0efe03aa69b3336d8e228b37d4ccb17324b88 +Subproject commit 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e -- cgit v1.2.3