archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8318737: Fallback linker passes bad JNI handle

Browse source 
Reviewed-by: alanb
This commit is contained in:
Jorn Vernee 2023-10-26 15:54:02 +00:00
parent 9864951dce
commit 3885dc5b9a
7 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/native/libfallbackLinker/fallbackLinker.c
View file

@ -42,12 +42,29 @@ static jclass LibFallback_class;
static jmethodID LibFallback_doUpcall_ID;
static const char* LibFallback_doUpcall_sig = "(JJLjava/lang/invoke/MethodHandle;)V";
JNIEXPORT void JNICALL
#define CHECK_NULL(expr) \
if (expr == NULL) { \
return JNI_FALSE; \
}
JNIEXPORT jboolean JNICALL
Java_jdk_internal_foreign_abi_fallback_LibFallback_init(JNIEnv* env, jclass cls) {
(*env)->GetJavaVM(env, &VM);
LibFallback_class = (*env)->FindClass(env, "jdk/internal/foreign/abi/fallback/LibFallback");
jint result = (*env)->GetJavaVM(env, &VM);
if (result != 0) {
return JNI_FALSE;
}
jclass LibFallback_class_local = (*env)->FindClass(env, "jdk/internal/foreign/abi/fallback/LibFallback");
CHECK_NULL(LibFallback_class_local)
LibFallback_class = (*env)->NewGlobalRef(env, LibFallback_class_local);
CHECK_NULL(LibFallback_class)
LibFallback_doUpcall_ID = (*env)->GetStaticMethodID(env,
LibFallback_class, "doUpcall", LibFallback_doUpcall_sig);
CHECK_NULL(LibFallback_doUpcall_ID)
return JNI_TRUE;
}
JNIEXPORT jlong JNICALL