Merge pull request #6 from xxDark/master

Author: Col-E

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>software.coley</groupId>
     <artifactId>lljzip</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
     <properties>
         <junit.version>5.8.2</junit.version>

src/main/java/software/coley/llzip/part/JvmLocalFileHeader.java

@@ -1,5 +1,6 @@
 package software.coley.llzip.part;
 
+import software.coley.llzip.ZipCompressions;
 import software.coley.llzip.util.ByteData;
 
 import java.util.NavigableSet;
@@ -14,6 +15,9 @@
  */
 public class JvmLocalFileHeader extends LocalFileHeader {
 	private final NavigableSet<Long> offsets;
+	private long offset;
+	private boolean foundPk;
+	private ByteData data;
 
 	/**
 	 * @param offsets
@@ -27,12 +31,30 @@ public JvmLocalFileHeader(NavigableSet<Long> offsets) {
 	public void read(ByteData data, long offset) {
 		super.read(data, offset);
 		// JVM file data reading does NOT use the compressed/uncompressed fields.
-		// Instead, it scans data until the next header/EOF.
+		// Instead, it scans data until the next header.
 		offset += MIN_FIXED_SIZE + getFileNameLength() + getExtraFieldLength();
+		this.offset = offset;
 		Long nextOffset = offsets.ceiling(offset);
-		if (nextOffset != null)
+		if (nextOffset != null) {
 			setFileData(data.slice(offset, nextOffset));
-		else
-			setFileData(data.slice(offset, data.length()));
+			foundPk = true;
+		} else {
+			this.data = data;
+		}
+	}
+
+	@Override
+	public void link(CentralDirectoryFileHeader directoryFileHeader) {
+		super.link(directoryFileHeader);
+		if (!foundPk) {
+			int fileDataLength;
+			if (getCompressionMethod() == ZipCompressions.STORED) {
+				fileDataLength = directoryFileHeader.getUncompressedSize();
+			} else {
+				fileDataLength = directoryFileHeader.getCompressedSize();
+			}
+			setFileData(data.sliceOf(offset, fileDataLength));
+			data = null;
+		}
 	}
 }

src/main/java/software/coley/llzip/strategy/DeflateDecompressor.java

@@ -28,27 +28,22 @@ public ByteData decompress(LocalFileHeader header, ByteData bytes) throws IOExce
 			byte[] buffer = new byte[1024];
 			long position = 0L;
 			long length = bytes.length();
-			boolean eof;
 			do {
-				eof = false;
 				if (inflater.needsInput()) {
 					int remaining = (int) Math.min(buffer.length, length);
 					if (remaining == 0) {
-						buffer[0] = 0;
-						inflater.setInput(buffer, 0, 1);
-						eof = true;
-					} else {
-						bytes.get(position, buffer, 0, remaining);
-						length -= remaining;
-						position += remaining;
-						inflater.setInput(buffer, 0, remaining);
+						break;
 					}
+					bytes.get(position, buffer, 0, remaining);
+					length -= remaining;
+					position += remaining;
+					inflater.setInput(buffer, 0, remaining);
 				}
 				int count = inflater.inflate(output);
 				if (count != 0) {
 					out.write(output, 0, count);
 				}
-			} while (!eof && !inflater.finished() && !inflater.needsDictionary());
+			} while (!inflater.finished() && !inflater.needsDictionary());
 		}catch (DataFormatException e) {
 			String s = e.getMessage();
 			throw (ZipException) new ZipException(s != null ? null : "Invalid ZLIB data format").initCause(e);

src/main/java/software/coley/llzip/strategy/JvmZipReaderStrategy.java

@@ -85,7 +85,10 @@ else if (ByteDataUtil.startsWith(data, jvmBaseOffset, ZipPatterns.CENTRAL_DIRECT
 		Set<Long> offsets = new HashSet<>();
 		TreeSet<Long> lfhOffsets = new TreeSet<>();
 		for (CentralDirectoryFileHeader directory : zip.getCentralDirectories()) {
-			lfhOffsets.add(jvmBaseOffset + directory.getRelativeOffsetOfLocalHeader());
+			long offset = jvmBaseOffset + directory.getRelativeOffsetOfLocalHeader();
+			if (ByteDataUtil.startsWith(data, offset, ZipPatterns.LOCAL_FILE_HEADER)) {
+				lfhOffsets.add(offset);
+			}
 		}
 		for (CentralDirectoryFileHeader directory : zip.getCentralDirectories()) {
 			long offset = jvmBaseOffset + directory.getRelativeOffsetOfLocalHeader();