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

Merge "NativeLibraryHelper: Minor fixes"

Browse Source 
am: c1536f0d10

Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797
This commit is contained in:
Andreas Gampe
2016-12-16 18:44:54 +00:00
committed by android-build-merger
parent 104a5c7a34 c1536f0d10
commit 109a82d7e3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/com_android_internal_content_NativeLibraryHelper.cpp
View File

@@ -243,7 +243,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr
return INSTALL_FAILED_INTERNAL_ERROR; return INSTALL_FAILED_INTERNAL_ERROR;
} }
*(localFileName + nativeLibPath.size()) = '/'; *(localTmpFileName + nativeLibPath.size()) = '/';
if (strlcpy(localTmpFileName + nativeLibPath.size(), TMP_FILE_PATTERN, if (strlcpy(localTmpFileName + nativeLibPath.size(), TMP_FILE_PATTERN,
TMP_FILE_PATTERN_LEN - nativeLibPath.size()) != TMP_FILE_PATTERN_LEN) { TMP_FILE_PATTERN_LEN - nativeLibPath.size()) != TMP_FILE_PATTERN_LEN) {
@@ -344,6 +344,11 @@ public:
const char* lastSlash = strrchr(fileName, '/'); const char* lastSlash = strrchr(fileName, '/');
ALOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName); ALOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName);
// Skip directories.
if (*(lastSlash + 1) == 0) {
continue;
}
// Make sure the filename is safe. // Make sure the filename is safe.
if (!isFilenameSafe(lastSlash + 1)) { if (!isFilenameSafe(lastSlash + 1)) {
continue; continue;