Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49a25312 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d am: 109a82d7 

am: 77274269

Change-Id: Id450c7da8d22390c0e7506ed9058bdbf261d3ef4
parents 04c372c2 77274269

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+6 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr 
        return INSTALL_FAILED_INTERNAL_ERROR;

    }



    *(localFileName + nativeLibPath.size()) = '/';

    *(localTmpFileName + nativeLibPath.size()) = '/';



    if (strlcpy(localTmpFileName + nativeLibPath.size(), TMP_FILE_PATTERN,

                    TMP_FILE_PATTERN_LEN - nativeLibPath.size()) != TMP_FILE_PATTERN_LEN) {
@@ -344,6 +344,11 @@ public: 
            const char* lastSlash = strrchr(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.

            if (!isFilenameSafe(lastSlash + 1)) {

                continue;