From 2bb3ea25327b221069d07826ab58a4ce6a151294 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Mon, 15 Feb 2016 18:30:56 -0700
Subject: [PATCH] do not null-terminate ZipEntry names in openjdk-src builds

OpenJDK's java.util.zip.ZipFile.getEntryBytes should return a byte
array that is not null-terminated, but we were giving it one that was
null-terminated, which caused lookups to fail later when
ZipFile.getInputStream was called.
---
 src/classpath-openjdk.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index 264b6cf33b..0da02d0eef 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -662,10 +662,10 @@ class MyClasspath : public Classpath {
 #ifdef AVIAN_OPENJDK_SRC
     interceptFileOperations(t, true);
 #else   // not AVIAN_OPENJDK_SRC
-#  ifdef PLATFORM_WINDOWS    
+#  ifdef PLATFORM_WINDOWS
     expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true));
 #  endif
-    expect(t, loadLibrary(t, libraryPath, "verify", true, true));    
+    expect(t, loadLibrary(t, libraryPath, "verify", true, true));
     expect(t, loadLibrary(t, libraryPath, "java", true, true));
 #endif  // not AVIAN_OPENJDK_SRC
 
@@ -1658,9 +1658,8 @@ int64_t JNICALL
     switch (type) {
     case 0: {  // name
       unsigned nameLength = fileNameLength(entry->start);
-      GcByteArray* array = makeByteArray(t, nameLength + 1);
+      GcByteArray* array = makeByteArray(t, nameLength);
       memcpy(array->body().begin(), fileName(entry->start), nameLength);
-      array->body()[nameLength] = 0;
       return reinterpret_cast<int64_t>(array);
     } break;