#366 Validate AES extra data record size

srikanth-lingala · Mar 21, 2022 · 229d902 · 229d902
1 parent 3cf0cf7
commit 229d902
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/net/lingala/zip4j/headers/HeaderReader.java b/src/main/java/net/lingala/zip4j/headers/HeaderReader.java
@@ -650,7 +650,8 @@ private AESExtraDataRecord readAesExtraDataRecord(List<ExtraDataRecord> extraDat
 
       if (extraDataRecord.getHeader() == HeaderSignature.AES_EXTRA_DATA_RECORD.getValue()) {
 
-        if (extraDataRecord.getData() == null) {
+        byte[] aesExtraDataRecordBytes = extraDataRecord.getData();
+        if (aesExtraDataRecordBytes == null || aesExtraDataRecordBytes.length != 9) {
           throw new ZipException("corrupt AES extra data records");
         }
 

diff --git a/src/test/java/net/lingala/zip4j/io/inputstream/ZipInputStreamIT.java b/src/test/java/net/lingala/zip4j/io/inputstream/ZipInputStreamIT.java
@@ -319,6 +319,15 @@ public void testExtractZipFileWithFileNameLength0ThrowsException() throws IOExce
         null, InternalZipConstants.BUFF_SIZE, false, 1);
   }
 
+  @Test
+  public void testExtractZipFileWithInvalidAesExtraDataRecordThrowsException() throws IOException {
+    expectedException.expect(ZipException.class);
+    expectedException.expectMessage("corrupt AES extra data records");
+
+    extractZipFileWithInputStreams(TestUtils.getTestArchiveFromResources("invalid_aes_extra_data_record_length_in_header"),
+        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/invalid_aes_extra_data_record_length_in_header b/src/test/resources/test-archives/invalid_aes_extra_data_record_length_in_header