More merging fixes and asan fix

pull/9626/head
Muxi Yan 8 years ago
parent b3cec5df24
commit 2a4731e2eb
  1. 2
      src/core/ext/transport/chttp2/transport/chttp2_transport.c
  2. 2
      src/core/lib/channel/compress_filter.c
  3. 2
      src/core/lib/channel/http_client_filter.c
  4. 1
      src/core/lib/surface/call.c

@ -1583,7 +1583,6 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx,
grpc_slice_buffer_swap(&s->unprocessed_incoming_frames_buffer,
&s->frame_storage);
}
/* error handling ok? */
error = deframe_unprocessed_incoming_frames(
exec_ctx, &s->data_parser, s,
&s->unprocessed_incoming_frames_buffer, NULL, s->recv_message);
@ -1593,6 +1592,7 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx,
&s->frame_storage);
grpc_slice_buffer_reset_and_unref_internal(
exec_ctx, &s->unprocessed_incoming_frames_buffer);
GRPC_ERROR_UNREF(error);
break;
} else if (*s->recv_message != NULL) {
break;

@ -222,7 +222,7 @@ static void got_slice(grpc_exec_ctx *exec_ctx, void *elemp, grpc_error *error) {
grpc_call_element *elem = elemp;
call_data *calld = elem->call_data;
if (GRPC_ERROR_NONE != grpc_byte_stream_pull(exec_ctx,
calld->send_op->send_message,
calld->send_op->payload->send_message.send_message,
&calld->incoming_slice)) {
/* Should never reach here */
abort();

@ -239,7 +239,7 @@ static void got_slice(grpc_exec_ctx *exec_ctx, void *elemp, grpc_error *error) {
call_data *calld = elem->call_data;
calld->send_message_blocked = false;
if (GRPC_ERROR_NONE != grpc_byte_stream_pull(exec_ctx,
calld->send_op.send_message,
calld->send_op->payload->send_message.send_message,
&calld->incoming_slice)) {
/* Should never reach here */
abort();

@ -1210,6 +1210,7 @@ static void receiving_slice_ready(grpc_exec_ctx *exec_ctx, void *bctlp,
*call->receiving_buffer = NULL;
call->receiving_message = 0;
finish_batch_step(exec_ctx, bctl);
GRPC_ERROR_UNREF(error);
}
}

Loading…
Cancel
Save