COMPRESS-432 make sure code doesn't get stuck in infinite loop

bodewig · bodewig · commit 2a2f1dc48e22 · 2017-12-22T19:34:57.000+01:00
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
@@ -310,7 +310,7 @@ public void parseCentralDirectoryFormat(final byte[] data, final int offset, fin
             this.hashAlg = HashAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + 12));
             this.hashSize = ZipShort.getValue(data, offset + 14);
             // srlist... hashed public keys
-            for (int i = 0; i < this.rcount; i++) {
+            for (long i = 0; i < this.rcount; i++) {
                 for (int j = 0; j < this.hashSize; j++) {
                     //  ZipUtil.signedByteToUnsignedInt(data[offset + 16 + (i * this.hashSize) + j]));
                 }

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public void parseCentralDirectoryFormat(final byte[] data, final int offset, fin`
`310`	`310`	`this.hashAlg = HashAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + 12));`
`311`	`311`	`this.hashSize = ZipShort.getValue(data, offset + 14);`
`312`	`312`	`// srlist... hashed public keys`
`313`		`- for (int i = 0; i < this.rcount; i++) {`
	`313`	`+ for (long i = 0; i < this.rcount; i++) {`
`314`	`314`	`for (int j = 0; j < this.hashSize; j++) {`
`315`	`315`	`// ZipUtil.signedByteToUnsignedInt(data[offset + 16 + (i * this.hashSize) + j]));`
`316`	`316`	`}`