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

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

Browse Source 
am: f420b91e26

Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
This commit is contained in:
Alex Klyubin
2016-12-20 18:45:57 +00:00
committed by android-build-merger
parent b50fdc7faa f420b91e26
commit be81b50b6e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
View File

@@ -579,7 +579,7 @@ public class ApkSignatureSchemeV2Verifier {
throws SignatureNotFoundException { throws SignatureNotFoundException {
// Look up the offset of ZIP Central Directory. // Look up the offset of ZIP Central Directory.
long centralDirOffset = ZipUtils.getZipEocdCentralDirectoryOffset(eocd); long centralDirOffset = ZipUtils.getZipEocdCentralDirectoryOffset(eocd);
if (centralDirOffset >= eocdOffset) { if (centralDirOffset > eocdOffset) {
throw new SignatureNotFoundException( throw new SignatureNotFoundException(
"ZIP Central Directory offset out of range: " + centralDirOffset "ZIP Central Directory offset out of range: " + centralDirOffset
+ ". ZIP End of Central Directory offset: " + eocdOffset); + ". ZIP End of Central Directory offset: " + eocdOffset);

2
core/java/android/util/apk/ZipUtils.java
View File

@@ -160,7 +160,7 @@ abstract class ZipUtils {
} }
int maxCommentLength = Math.min(archiveSize - ZIP_EOCD_REC_MIN_SIZE, UINT16_MAX_VALUE); int maxCommentLength = Math.min(archiveSize - ZIP_EOCD_REC_MIN_SIZE, UINT16_MAX_VALUE);
int eocdWithEmptyCommentStartPosition = archiveSize - ZIP_EOCD_REC_MIN_SIZE; int eocdWithEmptyCommentStartPosition = archiveSize - ZIP_EOCD_REC_MIN_SIZE;
for (int expectedCommentLength = 0; expectedCommentLength < maxCommentLength; for (int expectedCommentLength = 0; expectedCommentLength <= maxCommentLength;
expectedCommentLength++) { expectedCommentLength++) {
int eocdStartPos = eocdWithEmptyCommentStartPosition - expectedCommentLength; int eocdStartPos = eocdWithEmptyCommentStartPosition - expectedCommentLength;
if (zipContents.getInt(eocdStartPos) == ZIP_EOCD_REC_SIG) { if (zipContents.getInt(eocdStartPos) == ZIP_EOCD_REC_SIG) {