Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b89517 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

Merge "Make sure freeaddrinfo is always called on failure." am: f9140290 am: 9e1173aa am: 84cd98ce
am: 78bc132d

Change-Id: Ib446e6cf826e72e921e558ca34a31f74a9cdc063
parents 1d7bcf30 78bc132d

libcutils/socket_network_client_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int socket_network_client_timeout(const char* host, int port, int type, int time 
    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) {