diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-03-24 11:19:25 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-03-24 11:19:25 -0700 |
| commit | e3c566431e1e8a3e49c413ef3525218d20759b48 (patch) | |
| tree | 32a894dee6ba996866f515ad8565a1aacdb2b9c6 /src/core/ext/transport | |
| parent | c732abb08f5b3dfc4af956095927725afffaf6d2 (diff) | |
Merge upstream for error interface changes
Diffstat (limited to 'src/core/ext/transport')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 8 |
1 files changed, 4 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 a3e596fda7..1b0606ed9a 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -2351,13 +2351,13 @@ static grpc_error *deframe_unprocessed_incoming_frames( break; default: gpr_asprintf(&msg, "Bad GRPC frame type 0x%02x", p->frame_type); - p->error = GRPC_ERROR_CREATE(msg); + p->error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_STREAM_ID, (intptr_t)s->id); gpr_free(msg); msg = grpc_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); p->error = - grpc_error_set_str(p->error, GRPC_ERROR_STR_RAW_BYTES, msg); + grpc_error_set_str(p->error, GRPC_ERROR_STR_RAW_BYTES, grpc_slice_from_copied_string(msg)); gpr_free(msg); p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_OFFSET, cur - beg); @@ -2558,7 +2558,7 @@ static void incoming_byte_stream_next_locked(grpc_exec_ctx *exec_ctx, GRPC_ERROR_REF(bs->error)); } else if (bs->push_closed) { if (bs->remaining_bytes != 0) { - bs->error = GRPC_ERROR_CREATE("Truncated message"); + bs->error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); grpc_closure_sched(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_REF(bs->error)); } else { @@ -2597,7 +2597,7 @@ static grpc_error *incoming_byte_stream_pull(grpc_exec_ctx *exec_ctx, return error; } } else { - bs->error = GRPC_ERROR_CREATE("Truncated message"); + bs->error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); gpr_mu_unlock(&s->buffer_mu); return bs->error; } |