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

Commit f420b91e authored by Alex Klyubin's avatar Alex Klyubin Committed by Gerrit Code Review
Browse files

Merge "Permit 65535 byte ZIP comments and empty Central Directory"

parents 1e814b39 96946579

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class ApkSignatureSchemeV2Verifier { 
            throws SignatureNotFoundException {

        // Look up the offset of ZIP Central Directory.

        long centralDirOffset = ZipUtils.getZipEocdCentralDirectoryOffset(eocd);

        if (centralDirOffset >= eocdOffset) {

        if (centralDirOffset > eocdOffset) {

            throw new SignatureNotFoundException(

                    "ZIP Central Directory offset out of range: " + centralDirOffset

                    + ". ZIP End of Central Directory offset: " + eocdOffset);

core/java/android/util/apk/ZipUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ abstract class ZipUtils { 
        }

        int maxCommentLength = Math.min(archiveSize - ZIP_EOCD_REC_MIN_SIZE, UINT16_MAX_VALUE);

        int eocdWithEmptyCommentStartPosition = archiveSize - ZIP_EOCD_REC_MIN_SIZE;

        for (int expectedCommentLength = 0; expectedCommentLength < maxCommentLength;

        for (int expectedCommentLength = 0; expectedCommentLength <= maxCommentLength;

                expectedCommentLength++) {

            int eocdStartPos = eocdWithEmptyCommentStartPosition - expectedCommentLength;

            if (zipContents.getInt(eocdStartPos) == ZIP_EOCD_REC_SIG) {