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

Merge "Fix double close in NativeLibraryHelper.openApkFd."

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-21 03:01:53 +00:00
committed by Gerrit Code Review
parent fbc0ea6385 5fc8bbe114
commit 657650eaf0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/com_android_internal_content_NativeLibraryHelper.cpp
View File

@@ -27,6 +27,7 @@
#include <zlib.h> #include <zlib.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -567,7 +568,14 @@ com_android_internal_content_NativeLibraryHelper_openApkFd(JNIEnv *env, jclass,
return 0; 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); return reinterpret_cast<jlong>(zipFile);
} }