8276123: ZipFile::getEntry will not return a file entry when there is…

… a directory entry of the same name within a Zip File Reviewed-by: redestad, alanb
openjdk · Nov 12, 2021 · b85500e52479c48b02a96b28fddefa2b25d5d9bd · b85500e · openjdk-notifier · Nov 12, 2021
1 parent 0d2980c
commit b85500e52479c48b02a96b28fddefa2b25d5d9bd
Showing 2 changed files with 591 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -1631,13 +1631,18 @@ private int getEntryPos(String name, boolean addSlash) {
                         // slash
                         int entryLen = entry.length();
                         int nameLen = name.length();
-                        if ((entryLen == nameLen && entry.equals(name)) ||
-                                (addSlash &&
-                                nameLen + 1 == entryLen &&
-                                entry.startsWith(name) &&
-                                entry.charAt(entryLen - 1) == '/')) {
+                        if (entryLen == nameLen && entry.equals(name)) {
+                            // Found our match
                             return pos;
                         }
+                        // If addSlash is true we'll now test for name+/ providing
+                        if (addSlash && nameLen + 1 == entryLen
+                                && entry.startsWith(name) &&
+                                entry.charAt(entryLen - 1) == '/') {
+                            // Found the entry "name+/", now find the CEN entry pos
+                            int exactPos = getEntryPos(name, false);
+                            return exactPos == -1 ? pos : exactPos;
+                        }
                     } catch (IllegalArgumentException iae) {
                         // Ignore
                     }