aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/lb_policy/round_robin
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-09-28 13:19:01 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-09-28 13:19:01 -0700
commit94948b877457cc5fe2ec6ad4b08f3cf306a0f9de (patch)
treed421175f19e43f057466b1cde69e5d48dfdb3dde /src/core/ext/lb_policy/round_robin
parent25e229df095b68636a553f3bdbf9431c8e8cf5bb (diff)
parentb97f867b390193daf18988958183143726602727 (diff)
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/ext/lb_policy/round_robin')
-rw-r--r--src/core/ext/lb_policy/round_robin/round_robin.c2
1 files changed, 2 insertions, 0 deletions
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 56e889053f..930fa86aca 100644
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@@ -635,6 +635,8 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
if (args->addresses->addresses[i].is_balancer) continue;
memset(&sc_args, 0, sizeof(grpc_subchannel_args));
+ /* server_name will be copied as part of the subchannel creation. This makes
+ * the copying of args->server_name (a borrowed pointer) OK. */
sc_args.server_name = args->server_name;
sc_args.addr =
(struct sockaddr *)(&args->addresses->addresses[i].address.addr);