commit 3822c316d59904761be3f830cb49b56f075f57ae
author Elliott Hughes <enh@google.com> Thu Aug 03 00:06:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 00:06:57 2017 +0000
tree 6d6ffc9efd23332c26d6a1e54df67836a791b562
parent e70c36d57e4c8c1513b28709845c75088d1c9c85
parent 464fde4e1ac50cf5f6d7c850e29332a5c8be5581

Merge "Make sure freeaddrinfo is always called on failure." am: f914029057 am: 9e1173aa40 am: 84cd98ceb0
am: 78bc132d32

Change-Id: Ib446e6cf826e72e921e558ca34a31f74a9cdc063

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) {