Merge pull request #26 from dgquintas/resolve_test

fixes for resolve address
9 years ago · 480c4c600b
parent 7156b51087 d5520c13c2
commit 480c4c600b
2 changed files with 4 additions and 2 deletions
--- a/src/core/lib/iomgr/resolve_address_posix.c
+++ b/src/core/lib/iomgr/resolve_address_posix.c
@ -173,7 +173,9 @@ static void do_request_thread(grpc_exec_ctx *exec_ctx, void *rp,
 }

 void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) {
-  gpr_free(addrs->addrs);
+  if (addrs != NULL) {
+    gpr_free(addrs->addrs);
+  }
  gpr_free(addrs);
 }

--- a/test/core/iomgr/resolve_address_test.c
+++ b/test/core/iomgr/resolve_address_test.c
@ -62,7 +62,7 @@ static void must_succeed(grpc_exec_ctx *exec_ctx, void *argsp,
  args_struct *args = argsp;
  GPR_ASSERT(err == GRPC_ERROR_NONE);
  GPR_ASSERT(args->addrs != NULL);
-  GPR_ASSERT(args->addrs->naddrs > 1);
+  GPR_ASSERT(args->addrs->naddrs > 0);
  gpr_event_set(&args->ev, (void *)1);
 }