ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-28 23:24:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

OpenJDK: Implement JVM_FindClassFromCaller

Browse Source 
8015256: Better class accessibility
Summary: Improve protection domain check in forName()

Signed-off-by: Xerxes Rånby <xerxes@gudinna.com>
This commit is contained in:
Xerxes Rånby 2014-10-26 21:46:09 +01:00
parent 2e828b405c
commit 2e5990a6b0
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openjdk.ld
View File

@ -88,6 +88,7 @@ SUNWprivate_1.1 {
JVM_EnableCompiler; JVM_EnableCompiler;
JVM_Exit; JVM_Exit;
JVM_FillInStackTrace; JVM_FillInStackTrace;
JVM_FindClassFromCaller;
JVM_FindClassFromClass; JVM_FindClassFromClass;
JVM_FindClassFromClassLoader; JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader; JVM_FindClassFromBootLoader;

43
src/classpath-openjdk.cpp
View File

@ -4237,6 +4237,49 @@ extern "C" AVIAN_EXPORT void JNICALL
run(t, jvmResolveClass, arguments); run(t, jvmResolveClass, arguments);
} }
uint64_t jvmFindClassFromCaller(Thread* t, uintptr_t* arguments)
{
const char* name = reinterpret_cast<const char*>(arguments[0]);
jboolean init = arguments[1];
jobject loader = reinterpret_cast<jobject>(arguments[2]);
// jclass caller = reinterpret_cast<jclass>(arguments[3]);
/* XXX The caller's protection domain should be used during
the resolveClass but there is no specification or
unit-test in OpenJDK documenting the desired effect */
GcClass* c = resolveClass(
t,
loader ? cast<GcClassLoader>(t, *loader) : roots(t)->bootLoader(),
name,
true,
static_cast<Gc::Type>(GcClassNotFoundException::Type));
if (init) {
PROTECT(t, c);
initClass(t, c);
}
return reinterpret_cast<uint64_t>(makeLocalReference(t, getJClass(t, c)));
}
extern "C" AVIAN_EXPORT jclass JNICALL
EXPORT(JVM_FindClassFromCaller)(Thread* t,
const char* name,
jboolean init,
jobject loader,
jclass caller)
{
uintptr_t arguments[] = {reinterpret_cast<uintptr_t>(name),
init,
reinterpret_cast<uintptr_t>(loader),
reinterpret_cast<uintptr_t>(caller)};
return reinterpret_cast<jclass>(
run(t, jvmFindClassFromCaller, arguments));
}
uint64_t jvmFindClassFromClassLoader(Thread* t, uintptr_t* arguments) uint64_t jvmFindClassFromClassLoader(Thread* t, uintptr_t* arguments)
{ {
const char* name = reinterpret_cast<const char*>(arguments[0]); const char* name = reinterpret_cast<const char*>(arguments[0]);