ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-08 12:00:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #477 from dicej/getEntryBytes

Browse Source 
do not null-terminate ZipEntry names in openjdk-src builds
This commit is contained in:
Joshua Warner 2016-02-16 15:02:33 +00:00
commit cbfce38aa1
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
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;