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

Commit 9e1173aa 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

Change-Id: Iff3b186c35bca1f1c7292f5e5567d3ce11037239
parents 7aa81fcd f9140290

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