Mercurial > hg > release > icedtea7-forest-2.1 > jdk
changeset 4845:4d5e8509905e
8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c
Summary: Code does not check for JNU_GetEnv returning NULL.
Reviewed-by: anthony
author | aph |
---|---|
date | Tue, 04 Dec 2012 14:02:08 +0000 |
parents | 9dc51cdd7cec |
children | 44d9f9e05ca4 |
files | src/solaris/native/sun/xawt/XlibWrapper.c |
diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/xawt/XlibWrapper.c Mon Nov 19 11:13:08 2012 +0800 +++ b/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 14:02:08 2012 +0000 @@ -1260,13 +1260,15 @@ 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; } /*