Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed

Browse Source 
am: 7099984f4c

Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1
This commit is contained in:
Nick Kralevich
2017-01-01 22:59:55 +00:00
committed by android-build-merger
parent 0ad19476cb 7099984f4c
commit 5a35ec90bf
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_net_LocalSocketImpl.cpp
View File

@@ -202,9 +202,7 @@ static ssize_t socket_read_all(JNIEnv *env, jobject thisJ, int fd,
msg.msg_control = cmsgbuf; msg.msg_control = cmsgbuf;
msg.msg_controllen = sizeof(cmsgbuf); msg.msg_controllen = sizeof(cmsgbuf);
do { ret = TEMP_FAILURE_RETRY(recvmsg(fd, &msg, MSG_NOSIGNAL | MSG_CMSG_CLOEXEC));
ret = recvmsg(fd, &msg, MSG_NOSIGNAL);
} while (ret < 0 && errno == EINTR);
if (ret < 0 && errno == EPIPE) { if (ret < 0 && errno == EPIPE) {
// Treat this as an end of stream // Treat this as an end of stream