commit 01566bb917f4cca0535cc90ece7124eda7ab7f9a
author Elliott Hughes <enh@google.com> Wed Aug 02 23:10:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 23:10:59 2017 +0000
tree e204bd31feeb3e9e6c6419855d01ed4ba469c5c8
parent e8cc5086ce4625b2b05a25f6cb13a05fba65924c
parent 9e7262ca58ca91203d9b03f15b1d68948a072793

Merge "Make sure freeaddrinfo is always called on failure."
am: f914029057

Change-Id: Iff3b186c35bca1f1c7292f5e5567d3ce11037239

libcutils/socket_network_client_unix.c

diff --git a/libcutils/socket_network_client_unix.c b/libcutils/socket_network_client_unix.c
index 37851b1..1b87c49 100644
--- a/libcutils/socket_network_client_unix.c
+++ b/libcutils/socket_network_client_unix.c
@@ -63,7 +63,7 @@
     for (struct addrinfo* addr = addrs; addr != NULL; addr = addr->ai_next) {
         // The Mac doesn't have SOCK_NONBLOCK.
         int s = socket(addr->ai_family, type, addr->ai_protocol);
-        if (s == -1 || toggle_O_NONBLOCK(s) == -1) return -1;
+        if (s == -1 || toggle_O_NONBLOCK(s) == -1) break;
 
         int rc = connect(s, addr->ai_addr, addr->ai_addrlen);
         if (rc == 0) {