Merge pull request grpc#15078 from mehrdada/upmerge-1110

Upmerge v1.11.x into master
AtosNicoS · Apr 17, 2018 · 1f13655 · 1f13655
2 parents 8e6e89c + 81a7c53
commit 1f13655
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -135,6 +135,7 @@ AresDnsResolver::AresDnsResolver(const ResolverArgs& args)
   if (path[0] == '/') ++path;
   name_to_resolve_ = gpr_strdup(path);
   // Get DNS server from URI authority.
+  dns_server_ = nullptr;
   if (0 != strcmp(args.uri->authority, "")) {
     dns_server_ = gpr_strdup(args.uri->authority);
   }