commit 0a56dcabb910b331cad0ab424c9c5ed8c550f39d
author Stanley Cheung <stanleycheung@google.com> Mon Apr 06 21:14:21 2020 -0700
committer Stanley Cheung <stanleycheung@google.com> Mon Apr 06 21:14:21 2020 -0700
tree 3efb30d7444fdfbd243d3d0b2cc73f3fd3e5fae6
parent 4d91e531ab0f8cb7fc1e4ee3dcf7e8685d2da5c3

Fix cronet transport crash

src/core/ext/transport/cronet/transport/cronet_transport.cc

diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc
index acdc3fc..f2c4639 100644
--- a/src/core/ext/transport/cronet/transport/cronet_transport.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc
@@ -1072,9 +1072,15 @@
              op_can_be_run(stream_op, s, &oas->state, OP_SEND_MESSAGE)) {
     CRONET_LOG(GPR_DEBUG, "running: %p  OP_SEND_MESSAGE", oas);
     stream_state->pending_send_message = false;
-    if (stream_state->state_callback_received[OP_FAILED]) {
+    if (stream_state->state_op_done[OP_CANCEL_ERROR]) {
       result = NO_ACTION_POSSIBLE;
-      CRONET_LOG(GPR_DEBUG, "Stream is either cancelled or failed.");
+      CRONET_LOG(GPR_DEBUG, "Stream is cancelled.");
+    } else if (stream_state->state_callback_received[OP_FAILED]) {
+      result = NO_ACTION_POSSIBLE;
+      CRONET_LOG(GPR_DEBUG, "Stream failed.");
+    } else if (stream_state->state_callback_received[OP_SUCCEEDED]) {
+      result = NO_ACTION_POSSIBLE;
+      CRONET_LOG(GPR_DEBUG, "Stream is already finished.");
     } else {
       grpc_slice_buffer write_slice_buffer;
       grpc_slice slice;
@@ -1131,9 +1137,15 @@
              op_can_be_run(stream_op, s, &oas->state,
                            OP_SEND_TRAILING_METADATA)) {
     CRONET_LOG(GPR_DEBUG, "running: %p  OP_SEND_TRAILING_METADATA", oas);
-    if (stream_state->state_callback_received[OP_FAILED]) {
+    if (stream_state->state_op_done[OP_CANCEL_ERROR]) {
       result = NO_ACTION_POSSIBLE;
-      CRONET_LOG(GPR_DEBUG, "Stream is either cancelled or failed.");
+      CRONET_LOG(GPR_DEBUG, "Stream is cancelled.");
+    } else if (stream_state->state_callback_received[OP_FAILED]) {
+      result = NO_ACTION_POSSIBLE;
+      CRONET_LOG(GPR_DEBUG, "Stream failed.");
+    } else if (stream_state->state_callback_received[OP_SUCCEEDED]) {
+      result = NO_ACTION_POSSIBLE;
+      CRONET_LOG(GPR_DEBUG, "Stream is already done.");
     } else {
       CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, 0)", s->cbs);
       stream_state->state_callback_received[OP_SEND_MESSAGE] = false;