diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-13 10:44:25 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-13 10:44:25 -0700 |
| commit | 1c3fd1a4bf68417b0118e369e78c4db267f3191e (patch) | |
| tree | c398348a1b15cb066be7ca55c35e5f998a146db6 /src/core/ext/filters/client_channel | |
| parent | 50e11005a1f3de0a36f9d040a39696241b1f883f (diff) | |
| parent | ce286cb3a8946ff85d760d3988a75a5fcafe1b60 (diff) | |
Merge github.com:grpc/grpc into grpc_millis
Diffstat (limited to 'src/core/ext/filters/client_channel')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c index 0d71f3560e..2e2b411ab8 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c @@ -174,7 +174,7 @@ static void on_hostbyname_done_cb(void *arg, int status, int timeouts, grpc_lb_addresses_set_address( *lb_addresses, i, &addr, addr_len, hr->is_balancer /* is_balancer */, - hr->is_balancer ? strdup(hr->host) : NULL /* balancer_name */, + hr->is_balancer ? hr->host : NULL /* balancer_name */, NULL /* user_data */); char output[INET6_ADDRSTRLEN]; ares_inet_ntop(AF_INET6, &addr.sin6_addr, output, INET6_ADDRSTRLEN); @@ -195,7 +195,7 @@ static void on_hostbyname_done_cb(void *arg, int status, int timeouts, grpc_lb_addresses_set_address( *lb_addresses, i, &addr, addr_len, hr->is_balancer /* is_balancer */, - hr->is_balancer ? strdup(hr->host) : NULL /* balancer_name */, + hr->is_balancer ? hr->host : NULL /* balancer_name */, NULL /* user_data */); char output[INET_ADDRSTRLEN]; ares_inet_ntop(AF_INET, &addr.sin_addr, output, INET_ADDRSTRLEN); |