Fix not handling JvmLocalFileHeader data population as lazy-read

Author: Col-E

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>software.coley</groupId>
     <artifactId>lljzip</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
 
     <name>LL Java ZIP</name>
     <description>Lower level ZIP support for Java</description>

src/main/java/software/coley/llzip/format/model/AbstractZipFileHeader.java

@@ -325,4 +325,12 @@ protected LazyByteData readLongSlice(ByteData data, LazyInt localOffset, LazyLon
 			return data.sliceOf(offset + localOffset.get(), length.get());
 		});
 	}
+
+	protected LazyByteData readLongSlice(ByteData data, LazyLong localOffset, LazyLong length) {
+		return new LazyByteData(() -> {
+			if (data.isClosed())
+				throw new IllegalStateException("Cannot read from closed data source");
+			return data.sliceOf(offset + localOffset.get(), length.get());
+		});
+	}
 }

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

@@ -2,6 +2,8 @@
 
 import software.coley.llzip.format.compression.ZipCompressions;
 import software.coley.llzip.util.ByteData;
+import software.coley.llzip.util.lazy.LazyInt;
+import software.coley.llzip.util.lazy.LazyLong;
 
 import java.util.NavigableSet;
 
@@ -39,8 +41,10 @@ public void read(ByteData data, long offset) {
 		this.dataOffsetStart = dataOffsetStart;
 		this.dataOffsetEnd = dataOffsetEnd == null ? -1 : dataOffsetEnd;
 		if (dataOffsetEnd != null) {
-			// Valid data range found
-			setFileData(data.slice(dataOffsetStart, dataOffsetEnd));
+			// Valid data range found, map back to (localOffset, range)
+			fileData = readLongSlice(data,
+					new LazyLong(() -> dataOffsetStart - offset),
+					new LazyLong(() -> dataOffsetEnd - offset));
 			foundData = true;
 		} else {
 			// Keep data reference to attempt restoration with later when linking to the CEN.
@@ -78,7 +82,9 @@ public void link(CentralDirectoryFileHeader directoryFileHeader) {
 			// Data should not be overflowing into adjacent header entries.
 			// - If it is, the data here is likely intentionally tampered with to screw with parsers
 			if (fileDataLength + offset < dataOffsetEnd) {
-				setFileData(data.sliceOf(dataOffsetStart, fileDataLength));
+				fileData = readLongSlice(data,
+						new LazyLong(() -> dataOffsetStart - offset),
+						new LazyLong(() -> fileDataLength));
 				data = null;
 			}
 		}

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

@@ -40,7 +40,7 @@ public class LocalFileHeader extends AbstractZipFileHeader {
 	private transient CentralDirectoryFileHeader linkedDirectoryFileHeader;
 
 	// LocalFileHeader spec (plus common elements between this and central file)
-	private LazyByteData fileData;
+	protected LazyByteData fileData;
 
 	// Caches
 	private transient LazyLong fileDataLength;