dont segfault if --resolver_type is not supplied

pull/22001/head
Jan Tattermusch 5 years ago
parent 7d90fa8891
commit 2d73493b5e
  1. 4
      test/core/iomgr/resolve_address_posix_test.cc
  2. 4
      test/core/iomgr/resolve_address_test.cc

@ -231,9 +231,9 @@ int main(int argc, char** argv) {
gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s",
resolver.get()); resolver.get());
} }
if (gpr_stricmp(resolver_type, "native") == 0) { if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) {
GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native");
} else if (gpr_stricmp(resolver_type, "ares") == 0) { } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) {
GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares");
} else { } else {
gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native"); gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native");

@ -353,9 +353,9 @@ int main(int argc, char** argv) {
gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s",
resolver.get()); resolver.get());
} }
if (gpr_stricmp(resolver_type, "native") == 0) { if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) {
GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native");
} else if (gpr_stricmp(resolver_type, "ares") == 0) { } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) {
#ifndef GRPC_UV #ifndef GRPC_UV
GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares");
#endif #endif

Loading…
Cancel
Save