ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

do not null-terminate ZipEntry names in openjdk-src builds

Browse Source 
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.
This commit is contained in:
Joel Dice 2016-02-15 18:30:56 -07:00
parent 3b83277d5e
commit 2bb3ea2532
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/classpath-openjdk.cpp
View File

@ -662,10 +662,10 @@ class MyClasspath : public Classpath {
#ifdef AVIAN_OPENJDK_SRC #ifdef AVIAN_OPENJDK_SRC
interceptFileOperations(t, true); interceptFileOperations(t, true);
#else // not AVIAN_OPENJDK_SRC #else // not AVIAN_OPENJDK_SRC
# ifdef PLATFORM_WINDOWS # ifdef PLATFORM_WINDOWS
expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true)); expect(t, loadLibrary(t, libraryPath, "msvcr100", true, true));
# endif # 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)); expect(t, loadLibrary(t, libraryPath, "java", true, true));
#endif // not AVIAN_OPENJDK_SRC #endif // not AVIAN_OPENJDK_SRC
@ -1658,9 +1658,8 @@ int64_t JNICALL
switch (type) { switch (type) {
case 0: { // name case 0: { // name
unsigned nameLength = fileNameLength(entry->start); unsigned nameLength = fileNameLength(entry->start);
GcByteArray* array = makeByteArray(t, nameLength + 1); GcByteArray* array = makeByteArray(t, nameLength);
memcpy(array->body().begin(), fileName(entry->start), nameLength); memcpy(array->body().begin(), fileName(entry->start), nameLength);
array->body()[nameLength] = 0;
return reinterpret_cast<int64_t>(array); return reinterpret_cast<int64_t>(array);
} break; } break;