ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-16 07:27:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix incorrect argument marshalling in Unsafe.{allocate|free}Memory

Browse Source 
This was causing UnsafeTest to crash on PowerPC.
This commit is contained in:
Joel Dice 2012-05-02 18:00:12 -06:00
parent b0dd39aa86
commit 2107a09623
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/builtin.cpp
View File

@ -332,7 +332,8 @@ extern "C" JNIEXPORT int64_t JNICALL
Avian_sun_misc_Unsafe_allocateMemory
(Thread* t, object, uintptr_t* arguments)
{
void* p = malloc(arguments[1]);
int64_t size; memcpy(&size, arguments + 1, 8);
void* p = malloc(size);
if (p) {
return reinterpret_cast<int64_t>(p);
} else {
@ -344,9 +345,9 @@ extern "C" JNIEXPORT void JNICALL
Avian_sun_misc_Unsafe_freeMemory
(Thread*, object, uintptr_t* arguments)
{
void* p = reinterpret_cast<void*>(arguments[1]);
int64_t p; memcpy(&p, arguments + 1, 8);
if (p) {
free(p);
free(reinterpret_cast<void*>(p));
}
}