getNextEntry should return next zip entry even if current entry is no…

…t completely read

src/main/java/net/lingala/zip4j/io/inputstream/ZipInputStream.java

@@ -49,6 +49,7 @@ public class ZipInputStream extends InputStream {
   private LocalFileHeader localFileHeader;
   private CRC32 crc32 = new CRC32();
   private boolean extraDataRecordReadForThisEntry = false;
+  private byte[] endOfEntryBuffer;
 
   public ZipInputStream(InputStream inputStream) {
     this(inputStream, null);
@@ -64,6 +65,10 @@ public LocalFileHeader getNextEntry() throws IOException {
   }
 
   public LocalFileHeader getNextEntry(FileHeader fileHeader) throws IOException {
+    if (localFileHeader != null) {
+      readUntilEndOfEntry();
+    }
+
     localFileHeader = headerReader.readLocalFileHeader(inputStream);
 
     if (localFileHeader == null) {
@@ -300,6 +305,13 @@ private int getEncryptionHeaderSize(LocalFileHeader localFileHeader) {
     }
   }
 
+  private void readUntilEndOfEntry() throws IOException {
+    if (endOfEntryBuffer == null) {
+      endOfEntryBuffer = new byte[512];
+    }
+    while (read(endOfEntryBuffer) != -1);
+  }
+
   private boolean isEncryptionMethodZipStandard(LocalFileHeader localFileHeader) {
     return localFileHeader.isEncrypted() && EncryptionMethod.ZIP_STANDARD.equals(localFileHeader.getEncryptionMethod());
   }

src/test/java/net/lingala/zip4j/io/inputstream/ZipInputStreamIT.java

@@ -161,6 +161,17 @@ public void testExtractFilesForZipFileWithInvalidExtraDataRecordIgnoresIt() thro
     zipInputStream.close();
   }
 
+  @Test
+  public void testGetNextEntryReturnsNextEntryEvenIfEntryNotCompletelyRead() throws IOException {
+    File createZipFile = createZipFile(CompressionMethod.DEFLATE);
+    ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(createZipFile));
+    int numberOfEntries = 0;
+    while (zipInputStream.getNextEntry() != null) {
+      numberOfEntries++;
+    }
+    assertThat(numberOfEntries).isEqualTo(FILES_TO_ADD.size());
+  }
+
   private void extractZipFileWithInputStreams(File zipFile, char[] password) throws IOException {
     extractZipFileWithInputStreams(zipFile, password, 4096, AesVersion.TWO);
   }