commit 7c68c0c93e8a80e066d78e66db1ccb980bdf1779
author Nick Kralevich <nnk@google.com> Mon Jan 14 14:22:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 14 14:22:41 2019 -0800
tree 4c4a30e74c3168e67391a9f162187deb14f3a196
parent f5201994528909043e9e870442a4e1a3608e186b
parent a6fc0b724290710b07a4e779dddc5b784fd78b57

Merge "replace dup() with fcntl(F_DUPFD_CLOEXEC)"
am: a6fc0b7242

Change-Id: Ifdd7efd33b1e19dc6d0efc2bb7c3862918c6b775

core/jni/android_os_Parcel.cpp

diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index 7ef06dc..3b59321 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -473,7 +473,7 @@
     if (parcel != NULL) {
         int fd = parcel->readFileDescriptor();
         if (fd < 0) return NULL;
-        fd = dup(fd);
+        fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
         if (fd < 0) return NULL;
         return jniCreateFileDescriptor(env, fd);
     }