From 93fedc12db95d1e61c17537652cac3d4e27ddf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= <eirbjo@openjdk.org>
Date: Fri, 22 Dec 2023 16:09:22 +0000
Subject: [PATCH] 8321802: (zipfs) Add validation of incorrect LOC signature in
 ZipFileSystem

Reviewed-by: alanb, lancea
---
 .../share/classes/jdk/nio/zipfs/ZipFileSystem.java   |  5 ++++-
 test/jdk/jdk/nio/zipfs/CorruptedZipFilesTest.java    | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index 6f165ec1144..1924ccd11f8 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -2573,7 +2573,10 @@ class ZipFileSystem extends FileSystem {
                 pos = -pos + locpos;
                 byte[] buf = new byte[LOCHDR];
                 if (readNBytesAt(buf, 0, buf.length, pos) != LOCHDR) {
-                    throw new ZipException("invalid loc " + pos + " for entry reading");
+                    throw new ZipException("invalid LOC " + pos + " for entry reading");
+                }
+                if (LOCSIG(buf) != LOCSIG) {
+                    throw new ZipException("invalid LOC header (bad signature)");
                 }
                 pos += LOCHDR + LOCNAM(buf) + LOCEXT(buf);
             }
diff --git a/test/jdk/jdk/nio/zipfs/CorruptedZipFilesTest.java b/test/jdk/jdk/nio/zipfs/CorruptedZipFilesTest.java
index 57287c6d8ee..39701d073ab 100644
--- a/test/jdk/jdk/nio/zipfs/CorruptedZipFilesTest.java
+++ b/test/jdk/jdk/nio/zipfs/CorruptedZipFilesTest.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 8316141
+ * @bug 8316141 8321802
  * @summary test for correct detection and reporting of corrupted zip files
  * @run junit CorruptedZipFilesTest
  */
@@ -287,6 +287,16 @@ public class CorruptedZipFilesTest {
         assertZipException(".*unsupported compression method.*");
     }
 
+    /*
+     * A ZipException is thrown when a LOC header has an unexpected signature
+     */
+    @Test
+    public void invalidLOCSignature() throws IOException {
+        int existingSignature = buffer.getInt(locpos);
+        buffer.putInt(locpos, existingSignature +1);
+        assertZipException(".*bad signature.*");
+    }
+
     /*
      * Assert that opening a ZIP file and consuming the entry's
      * InputStream using the ZipFile API fails with a ZipException