#371 Handle unexpected eof when reading stream

srikanth-lingala · Mar 22, 2022 · 55dc47b · 55dc47b
1 parent 5b3c43b
commit 55dc47b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/net/lingala/zip4j/io/inputstream/ZipEntryInputStream.java b/src/main/java/net/lingala/zip4j/io/inputstream/ZipEntryInputStream.java
@@ -58,6 +58,10 @@ public int readRawFully(byte[] b) throws  IOException {
 
     int readLen = inputStream.read(b);
 
+    if (readLen == -1) {
+      throw new IOException("Unexpected EOF reached when trying to read stream");
+    }
+
     if (readLen != b.length) {
       readLen = readUntilBufferIsFull(b, readLen);
 

diff --git a/src/test/java/net/lingala/zip4j/io/inputstream/ZipInputStreamIT.java b/src/test/java/net/lingala/zip4j/io/inputstream/ZipInputStreamIT.java
@@ -328,6 +328,15 @@ public void testExtractZipFileWithInvalidAesExtraDataRecordThrowsException() thr
         null, InternalZipConstants.BUFF_SIZE, false, 1);
   }
 
+  @Test
+  public void testExtractZipFileWhenUnexpectedEofReachedThrowsException() throws IOException {
+    expectedException.expect(IOException.class);
+    expectedException.expectMessage("Unexpected EOF reached when trying to read stream");
+
+    extractZipFileWithInputStreams(TestUtils.getTestArchiveFromResources("unexpected-eof-when-reading-stream"),
+        null, InternalZipConstants.BUFF_SIZE, false, 1);
+  }
+
   private void extractZipFileWithInputStreams(File zipFile, char[] password) throws IOException {
     extractZipFileWithInputStreams(zipFile, password, InternalZipConstants.BUFF_SIZE);
   }

diff --git a/src/test/resources/test-archives/unexpected-eof-when-reading-stream b/src/test/resources/test-archives/unexpected-eof-when-reading-stream