Fix flow control problem

1 files changed, 9 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 29ed4bf90e..16cf40c2c9 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c
@@ -1441,12 +1441,19 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op,
   }
 
   if (op->recv_message) {
+    size_t already_received;
     GPR_ASSERT(s->recv_message_ready == NULL);
+    GPR_ASSERT(!s->pending_byte_stream);
     s->recv_message_ready = op_payload->recv_message.recv_message_ready;
     s->recv_message = op_payload->recv_message.recv_message;
-    if (s->id != 0 && s->frame_storage.length == 0) {
-      incoming_byte_stream_update_flow_control(exec_ctx, t, s, 5, 0);
+    if (s->pending_byte_stream) {
+      already_received = s->frame_storage.length;
+    } else {
+      already_received = s->frame_storage.length +
+                         s->unprocessed_incoming_frames_buffer.length;
     }
+    incoming_byte_stream_update_flow_control(exec_ctx, t, s, 5,
+                                             already_received);
     grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s);
   }