--- a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java	Mon Jan 04 12:25:45 2016 -0500
+++ b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java	Mon Jan 04 14:34:53 2016 -0800
@@ -1251,7 +1251,7 @@
                     idx = getEntryNext(idx);
                 }
                 /* If not addSlash, or slash is already there, we are done */
-                if (!addSlash  || name[name.length - 1] == '/') {
+                if (!addSlash  || name.length == 0 || name[name.length - 1] == '/') {
                      return -1;
                 }
                 /* Add slash and try once more */