aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David G. Quintas <dgq@google.com>2018-01-30 20:04:55 -0800
committerGravatar GitHub <noreply@github.com>2018-01-30 20:04:55 -0800
commit64637bf4a277916ebd92d3999af1eb7757ac42bc (patch)
tree045704abe3f83b466fd15e5e13711e02be72b3e6
parenta984e458bdeadbef7cf4fdf45927977d52daade5 (diff)
parentf550426ebafcdda87497bdb827f1f699508dcf2c (diff)
Merge pull request #14230 from dgquintas/fix_ares_wrapper_lb_addr
Don't destroy null lb_addr
-rw-r--r--src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
index 2b35bdb605..e05f9d2f2f 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
@@ -505,7 +505,7 @@ static void on_dns_lookup_done_cb(void* arg, grpc_error* error) {
}
}
GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error));
- grpc_lb_addresses_destroy(r->lb_addrs);
+ if (r->lb_addrs != nullptr) grpc_lb_addresses_destroy(r->lb_addrs);
gpr_free(r);
}