Skip to content
Snippets Groups Projects
Commit 375109d3 authored by Mark D. Roth's avatar Mark D. Roth
Browse files

Merge branch 'filter_call_init_failure' into filter_api

parents d1ec2583 afa86424
No related branches found
No related tags found
No related merge requests found
...@@ -706,8 +706,7 @@ grpc_error *grpc_connected_subchannel_create_call( ...@@ -706,8 +706,7 @@ grpc_error *grpc_connected_subchannel_create_call(
grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con);
*call = gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size); *call = gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size);
grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(*call); grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(*call);
(*call)->connection = con; (*call)->connection = con; // Ref is added below.
GRPC_CONNECTED_SUBCHANNEL_REF(con, "subchannel_call");
grpc_error *error = grpc_error *error =
grpc_call_stack_init(exec_ctx, chanstk, 1, subchannel_call_destroy, *call, grpc_call_stack_init(exec_ctx, chanstk, 1, subchannel_call_destroy, *call,
NULL, NULL, callstk); NULL, NULL, callstk);
...@@ -715,8 +714,10 @@ grpc_error *grpc_connected_subchannel_create_call( ...@@ -715,8 +714,10 @@ grpc_error *grpc_connected_subchannel_create_call(
const char *error_string = grpc_error_string(error); const char *error_string = grpc_error_string(error);
gpr_log(GPR_ERROR, "error: %s", error_string); gpr_log(GPR_ERROR, "error: %s", error_string);
grpc_error_free_string(error_string); grpc_error_free_string(error_string);
gpr_free(*call);
return error; return error;
} }
GRPC_CONNECTED_SUBCHANNEL_REF(con, "subchannel_call");
grpc_call_stack_set_pollset_or_pollset_set(exec_ctx, callstk, pollent); grpc_call_stack_set_pollset_or_pollset_set(exec_ctx, callstk, pollent);
return GRPC_ERROR_NONE; return GRPC_ERROR_NONE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment