Read unsigned int values as required by Zip spec (#514)

Author: lukehutch

src/main/java/nonapi/io/github/classgraph/fastzipfilereader/LogicalZipFile.java

@@ -447,7 +447,7 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
         // initially just try reading back a maximum of 32 characters.
         long eocdPos = -1;
         for (long i = slice.sliceLength - 22, iMin = slice.sliceLength - 22 - 32; i >= iMin && i >= 0L; --i) {
-            if (reader.readInt(i) == 0x06054b50) {
+            if (reader.readUnsignedInt(i) == 0x06054b50L) {
                 eocdPos = i;
                 break;
             }
@@ -466,7 +466,7 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
                     /* inflatedLengthHint = */ 0L, nestedJarHandler)) {
                 final RandomAccessReader eocdReader = arraySlice.randomAccessReader();
                 for (long i = eocdBytes.length - 22L; i >= 0L; --i) {
-                    if (eocdReader.readInt(i) == 0x06054b50) {
+                    if (eocdReader.readUnsignedInt(i) == 0x06054b50L) {
                         eocdPos = i + readStartOff;
                         break;
                     }
@@ -491,17 +491,17 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
 
         // Check for Zip64 End Of Central Directory Locator record
         final long zip64cdLocIdx = eocdPos - 20;
-        if (zip64cdLocIdx >= 0 && reader.readInt(zip64cdLocIdx) == 0x07064b50) {
-            if (reader.readInt(zip64cdLocIdx + 4) > 0 || reader.readInt(zip64cdLocIdx + 16) > 1) {
+        if (zip64cdLocIdx >= 0 && reader.readUnsignedInt(zip64cdLocIdx) == 0x07064b50L) {
+            if (reader.readUnsignedInt(zip64cdLocIdx + 4) > 0 || reader.readUnsignedInt(zip64cdLocIdx + 16) > 1) {
                 throw new IOException("Multi-disk jarfiles not supported: " + getPath());
             }
             final long eocdPos64 = reader.readLong(zip64cdLocIdx + 8);
-            if (reader.readInt(eocdPos64) != 0x06064b50) {
+            if (reader.readUnsignedInt(eocdPos64) != 0x06064b50L) {
                 throw new IOException("Zip64 central directory at location " + eocdPos64
                         + " does not have Zip64 central directory header: " + getPath());
             }
             final long numEnt64 = reader.readLong(eocdPos64 + 24);
-            if (reader.readInt(eocdPos64 + 16) > 0 || reader.readInt(eocdPos64 + 20) > 0
+            if (reader.readUnsignedInt(eocdPos64 + 16) > 0 || reader.readUnsignedInt(eocdPos64 + 20) > 0
                     || numEnt64 != reader.readLong(eocdPos64 + 32)) {
                 throw new IOException("Multi-disk jarfiles not supported: " + getPath());
             }
@@ -565,10 +565,10 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
             // numEnt and numEnt64 were inconsistent -- manually count entries
             numEnt = 0;
             for (long entOff = 0; entOff + 46 <= cenSize;) {
-                final int sig = cenReader.readInt(entOff);
-                if (sig != 0x02014b50) {
-                    throw new IOException("Invalid central directory signature: 0x" + Integer.toString(sig, 16)
-                            + ": " + getPath());
+                final long sig = cenReader.readUnsignedInt(entOff);
+                if (sig != 0x02014b50L) {
+                    throw new IOException("Invalid central directory signature: 0x"
+                            + Integer.toString((int) sig, 16) + ": " + getPath());
                 }
                 final int filenameLen = cenReader.readUnsignedShort(entOff + 28);
                 final int extraFieldLen = cenReader.readUnsignedShort(entOff + 30);
@@ -597,10 +597,10 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
         try {
             int entSize = 0;
             for (long entOff = 0; entOff + 46 <= cenSize; entOff += entSize) {
-                final int sig = cenReader.readInt(entOff);
-                if (sig != 0x02014b50) {
-                    throw new IOException("Invalid central directory signature: 0x" + Integer.toString(sig, 16)
-                            + ": " + getPath());
+                final long sig = cenReader.readUnsignedInt(entOff);
+                if (sig != 0x02014b50L) {
+                    throw new IOException("Invalid central directory signature: 0x"
+                            + Integer.toString((int) sig, 16) + ": " + getPath());
                 }
                 final int filenameLen = cenReader.readUnsignedShort(entOff + 28);
                 final int extraFieldLen = cenReader.readUnsignedShort(entOff + 30);
@@ -651,7 +651,7 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
                 // Get external file attributes
                 final int fileAttributes = cenReader.readUnsignedShort(entOff + 40);
 
-                long pos = cenReader.readInt(entOff + 42);
+                long pos = cenReader.readUnsignedInt(entOff + 42);
 
                 // Check for Zip64 header in extra fields
                 // See:
@@ -700,7 +700,7 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
 
                         } else if (tag == 0x5455 && size >= 5) {
                             // Extended Unix timestamp
-                            final byte bits = cenReader.readByte(tagOff + 4 + 0);
+                            final int bits = cenReader.readUnsignedByte(tagOff + 4 + 0);
                             if ((bits & 1) == 1 && size >= 5 + 8) {
                                 lastModifiedMillis = cenReader.readLong(tagOff + 4 + 1) * 1000L;
                             }
@@ -715,7 +715,7 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
 
                         } else if (tag == 0x7075) {
                             // Info-ZIP Unicode path extra field
-                            final byte version = cenReader.readByte(tagOff + 4 + 0);
+                            final int version = cenReader.readUnsignedByte(tagOff + 4 + 0);
                             if (version != 1) {
                                 throw new IOException("Unknown Unicode entry name format " + version
                                         + " in extra field: " + entryNameSanitized);
@@ -777,13 +777,6 @@ private void readCentralDirectory(final NestedJarHandler nestedJarHandler, final
                     continue;
                 }
 
-                if (getPhysicalFile().getName().endsWith("bigjar.jar")) {
-                    System.out.println(entryNameSanitized);
-                    if (entryNameSanitized.equals("aa/output16.bin")) {
-                        System.out.println("here");
-                    }
-                }
-
                 // Add zip entry
                 final FastZipEntry entry = new FastZipEntry(this, locHeaderPos, entryNameSanitized, isDeflated,
                         compressedSize, uncompressedSize, lastModifiedMillis, lastModifiedTimeMSDOS,