ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 84cd98ceb0

Change-Id: I3d36bf694b20cf423cf1b3b5f647f7e907f20703
This commit is contained in:
Elliott Hughes 2017-08-02 23:28:54 +00:00 • committed by android-build-merger
commit 78bc132d32
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/socket_network_client_unix.c
View file

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