8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c
Code does not check for JNU_GetEnv returning NULL. Reviewed-by: anthony
This commit is contained in:
parent
ec15d0a1b0
commit
0b8ff32553
@ -1260,13 +1260,15 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_IsKanaKeyboard
|
||||
|
||||
JavaVM* jvm = NULL;
|
||||
static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
|
||||
JNIEnv * env;
|
||||
if (jvm != NULL) {
|
||||
JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
|
||||
return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I",
|
||||
ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
|
||||
} else {
|
||||
return 0;
|
||||
env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
|
||||
if (env) {
|
||||
return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I",
|
||||
ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user