stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c

Browse Source 
Code does not check for JNU_GetEnv returning NULL.

Reviewed-by: anthony
This commit is contained in:
Andrew Haley 2012-12-04 14:02:08 +00:00
parent ec15d0a1b0
commit 0b8ff32553
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/solaris/native/sun/xawt/XlibWrapper.c
View File

@ -1260,14 +1260,16 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_IsKanaKeyboard
JavaVM* jvm = NULL; JavaVM* jvm = NULL;
static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) { static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
JNIEnv * env;
if (jvm != NULL) { if (jvm != NULL) {
JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
if (env) {
return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I",
ptr_to_jlong(dpy), ptr_to_jlong(event)).i; ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
} else {
return 0;
} }
} }
return 0;
}
/* /*
* Class: sun_awt_X11_XlibWrapper * Class: sun_awt_X11_XlibWrapper