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

only return null from JVM_GetClassLoader when called from Unsafe.getUnsafe

Browse Source 
sun.misc.Unsafe.getUnsafe expects a null result if the class loader is
the boot classloader and will throw a SecurityException otherwise
(whereas it should really be checking both for null and comparing
against the system classloader).  However, just returning null
whenever the loader is the boot loader can cause trouble for embedded
apps which put everything in the boot loader, including application
resources.

Therefore, we only return null if it's the boot loader and we're being
called from Unsafe.getUnsafe.
This commit is contained in:
Joel Dice 2010-11-04 11:43:50 -06:00
parent cabad6926f
commit 4cb796d2fb
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/classpath-openjdk.cpp
View File

@ -391,9 +391,8 @@ class MyClasspath : public Classpath {
}
#endif // not AVIAN_OPENJDK_SRC
t->m->processor->invoke
(t, root(t, Machine::BootLoader), "java/lang/System",
"initializeSystemClass", "()V", 0);
resolveSystemClass(t, root(t, Machine::BootLoader),
className(t, type(t, Machine::ClassLoaderType)));
if (UNLIKELY(t->exception)) return;
object constructor = resolveMethod
@ -424,6 +423,10 @@ class MyClasspath : public Classpath {
cast<uint8_t>(classStaticTable(t, type(t, Machine::ClassLoaderType)),
fieldOffset(t, sclSet)) = true;
t->m->processor->invoke
(t, root(t, Machine::BootLoader), "java/lang/System",
"initializeSystemClass", "()V", 0);
}
virtual const char*
@ -1781,8 +1784,24 @@ JVM_GetClassLoader(Thread* t, jclass c)
ENTER(t, Thread::ActiveState);
object loader = classLoader(t, jclassVmClass(t, *c));
return loader == root(t, Machine::BootLoader)
? 0 : makeLocalReference(t, loader);
if (loader == root(t, Machine::BootLoader)) {
// sun.misc.Unsafe.getUnsafe expects a null result if the class
// loader is the boot classloader and will throw a
// SecurityException otherwise.
object caller = getCaller(t, 2);
if (caller and strcmp
(reinterpret_cast<const char*>
(&byteArrayBody(t, className(t, methodClass(t, caller)), 0)),
"sun/misc/Unsafe") == 0)
{
return 0;
} else {
return makeLocalReference(t, root(t, Machine::BootLoader));
}
} else {
return makeLocalReference(t, loader);
}
}
extern "C" JNIEXPORT jboolean JNICALL