Always pass cause exception to ZipParseException

Author: Col-E

src/main/java/software/coley/lljzip/format/model/CentralDirectoryFileHeader.java

@@ -100,29 +100,31 @@ public void read(@Nonnull MemorySegment data, long offset) throws ZipParseExcept
 			internalFileAttributes = readWord(data, offset, 36);
 			externalFileAttributes = readQuad(data, offset, 38);
 			relativeOffsetOfLocalHeader = readMaskedLongQuad(data, offset, 42);
+		} catch (IndexOutOfBoundsException ex) {
+			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_OTHER);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		try {
-			fileName = StringData.of(readSlice(data, offset, 46, fileNameLength));
+			fileName = StringData.of(data, offset + 46, fileNameLength);
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_NAME);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		try {
 			extraField = MemorySegmentData.of(data, offset + 46 + fileNameLength, extraFieldLength);
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_EXTRA);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		try {
 			fileComment = StringData.of(readSlice(data, offset, 46 + fileNameLength + extraFieldLength, fileCommentLength));
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_CEN_COMMENT);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 	}
 

src/main/java/software/coley/lljzip/format/model/JvmLocalFileHeader.java

@@ -91,7 +91,7 @@ public void read(@Nonnull MemorySegment data, long offset) throws ZipParseExcept
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_DATA);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 
 		// Update sizes where possible

src/main/java/software/coley/lljzip/format/model/LocalFileHeader.java

@@ -82,30 +82,32 @@ public void read(@Nonnull MemorySegment data, long offset) throws ZipParseExcept
 			uncompressedSize = readMaskedLongQuad(data, offset, 22);
 			fileNameLength = readWord(data, offset, 26);
 			extraFieldLength = readWord(data, offset, 28);
+		} catch (IndexOutOfBoundsException ex) {
+			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_OTHER);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		try {
 			fileName = StringData.of(readSlice(data, offset, MIN_FIXED_SIZE, fileNameLength));
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_NAME);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		try {
 			extraField = MemorySegmentData.of(data, offset + MIN_FIXED_SIZE + fileNameLength, extraFieldLength);
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_EXTRA);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 		long fileDataLength = (compressionMethod == STORED) ? uncompressedSize : compressedSize;
 		try {
 			fileData = MemorySegmentData.of(readLongSlice(data, offset, MIN_FIXED_SIZE + fileNameLength + extraFieldLength, fileDataLength));
 		} catch (IndexOutOfBoundsException ex) {
 			throw new ZipParseException(ex, ZipParseException.Type.IOOBE_FILE_DATA);
 		} catch (Throwable t) {
-			throw new ZipParseException(ZipParseException.Type.OTHER);
+			throw new ZipParseException(t, ZipParseException.Type.OTHER);
 		}
 	}
 

src/main/java/software/coley/lljzip/format/model/ZipParseException.java

@@ -12,15 +12,11 @@
 public class ZipParseException extends Exception {
 	private final Type type;
 
-	public ZipParseException(@Nullable IndexOutOfBoundsException cause, @Nonnull Type type) {
+	public ZipParseException(@Nullable Throwable cause, @Nonnull Type type) {
 		super(type.getMessage(), cause);
 		this.type = type;
 	}
 
-	public ZipParseException(@Nonnull Type type) {
-		this(null, type);
-	}
-
 	/**
 	 * @return Parse failure case.
 	 */
@@ -37,6 +33,7 @@ public enum Type {
 		IOOBE_FILE_DATA("Bounds check failed reading file data"),
 		IOOBE_FILE_EXTRA("Bounds check failed reading file extra"),
 		IOOBE_CEN_COMMENT("Bounds check failed reading directory comment"),
+		IOOBE_OTHER("Bounds check failed"),
 		OTHER("Unknown zip parse error");
 
 		private final String message;