diff options
| author |  Yuchen Zeng <y-zeng@users.noreply.github.com> | 2017-03-22 10:40:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-22 10:40:59 -0700 |
| commit | be0dba162edf8a105a0e529f1e70e2b352137d4c (patch) | |
| tree | 6e966e45b3935ca234d17130efd106002b574eec /src/core | |
| parent | b130275bb4c54562ac9341b12520e22b802a16d5 (diff) | |
| parent | c88fd35f979e18a74c9ffb761379f49a12db4cbb (diff) | |
Merge pull request #10247 from y-zeng/fix_lb_subchannel
Fix fuzzing detected error: remaining GRPC_ARG_SUBCHANNEL_ADDRESS was not removed by pick_first and round_robin
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/lb_policy/pick_first/pick_first.c | 6 | ||||
| -rw-r--r-- | src/core/ext/lb_policy/round_robin/round_robin.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c index e2a66d16bd..179dcd6eac 100644 --- a/src/core/ext/lb_policy/pick_first/pick_first.c +++ b/src/core/ext/lb_policy/pick_first/pick_first.c @@ -423,11 +423,13 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx, "This LB policy doesn't support user data. It will be ignored"); } + static const char *keys_to_remove[] = {GRPC_ARG_SUBCHANNEL_ADDRESS}; memset(&sc_args, 0, sizeof(grpc_subchannel_args)); grpc_arg addr_arg = grpc_create_subchannel_address_arg(&addresses->addresses[i].address); - grpc_channel_args *new_args = - grpc_channel_args_copy_and_add(args->args, &addr_arg, 1); + grpc_channel_args *new_args = grpc_channel_args_copy_and_add_and_remove( + args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &addr_arg, + 1); gpr_free(addr_arg.value.string); sc_args.args = new_args; grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel( diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c index f2d1d46179..09562d30ed 100644 --- a/src/core/ext/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/lb_policy/round_robin/round_robin.c @@ -709,11 +709,13 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx, /* Skip balancer addresses, since we only know how to handle backends. */ if (addresses->addresses[i].is_balancer) continue; + static const char *keys_to_remove[] = {GRPC_ARG_SUBCHANNEL_ADDRESS}; memset(&sc_args, 0, sizeof(grpc_subchannel_args)); grpc_arg addr_arg = grpc_create_subchannel_address_arg(&addresses->addresses[i].address); - grpc_channel_args *new_args = - grpc_channel_args_copy_and_add(args->args, &addr_arg, 1); + grpc_channel_args *new_args = grpc_channel_args_copy_and_add_and_remove( + args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &addr_arg, + 1); gpr_free(addr_arg.value.string); sc_args.args = new_args; grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel( |