commit 657650eaf0cbd142d94787cd812fc7a9c1d61c2a
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 21 03:01:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 21 03:01:53 2018 +0000
tree e9b19a5aadf81c201f8dfa1c954e167edeb1235f
parent fbc0ea638575fec0402fcdfebe62d4398fcfae84
parent 5fc8bbe1140879141893980194db18760bf8876a

Merge "Fix double close in NativeLibraryHelper.openApkFd."

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
index cc2646c..dc04269 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -27,6 +27,7 @@
 
 #include <zlib.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ -567,7 +568,14 @@
         return 0;
     }
 
-    ZipFileRO* zipFile = ZipFileRO::openFd(fd, debugFilePath.c_str());
+    int dupedFd = dup(fd);
+    if (dupedFd == -1) {
+        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
+                             "Failed to dup FileDescriptor: %s", strerror(errno));
+        return 0;
+    }
+
+    ZipFileRO* zipFile = ZipFileRO::openFd(dupedFd, debugFilePath.c_str());
 
     return reinterpret_cast<jlong>(zipFile);
 }