Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

dont segfault if --resolver_type is not supplied

Browse Source
pull/22001/head
Jan Tattermusch 5 years ago
parent 7d90fa8891
commit 2d73493b5e
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      test/core/iomgr/resolve_address_posix_test.cc
  2. 4
      test/core/iomgr/resolve_address_test.cc

4
test/core/iomgr/resolve_address_posix_test.cc
Unescape View File

@ -231,9 +231,9 @@ int main(int argc, char** argv) {
gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s",
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");
} 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");
} else {
gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native");

4
test/core/iomgr/resolve_address_test.cc
Unescape View File

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

Write Preview
Loading…
Cancel
Save