RFC: backport S6986968: Crash on XIM server restart

[Dr Andrew John Hughes]

On 15:39 Wed 09 Mar     , Omair Majid wrote:
> Hi,
> 
> I would like to backport S6986968 which fixes a crash that happens 
> whenever the XIM server (for example, iBus) restarts while the java 
> application has focus.
> 
> Okay to commit?
> 
> Cheers,
> Omair

Ok by me.

> diff -r 4cbe17b91cc8 ChangeLog
> --- a/ChangeLog	Wed Mar 09 10:50:40 2011 +0100
> +++ b/ChangeLog	Wed Mar 09 15:38:30 2011 -0500
> @@ -1,3 +1,8 @@
> +2011-03-09  Omair Majid  <omajid at redhat.com>
> +
> +	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
> +	* patches/openjdk/6986968-crash_on_xim_restart.patch: New file.
> +
>  2011-03-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* Makefile.am: Add new patch.
> diff -r 4cbe17b91cc8 Makefile.am
> --- a/Makefile.am	Wed Mar 09 10:50:40 2011 +0100
> +++ b/Makefile.am	Wed Mar 09 15:38:30 2011 -0500
> @@ -326,7 +326,8 @@
>  	patches/openjdk/6934977-MappedByteBuffer.load.patch \
>  	patches/jaxp-serial-version-uid.patch \
>  	patches/jtreg-hotspot-bug-6196102.patch \
> -	patches/jtreg-double-to-string.patch
> +	patches/jtreg-double-to-string.patch \
> +	patches/openjdk/6986968-crash_on_xim_restart.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r 4cbe17b91cc8 patches/openjdk/6986968-crash_on_xim_restart.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/6986968-crash_on_xim_restart.patch	Wed Mar 09 15:38:30 2011 -0500
> @@ -0,0 +1,23 @@
> +# HG changeset patch
> +# User omajid
> +# Date 1285601403 14400
> +# Node ID bbadb9484f537ce1e6ecf6e0d1f130235367c7e4
> +# Parent  278c8daa30750577cadb47f7c6c827d2dfb7d0bd
> +6986968: Crash on XIM server restart
> +Summary: Free XIM data structures on DestroyXIMCallback
> +Reviewed-by: naoto
> +
> +diff -r 278c8daa3075 -r bbadb9484f53 src/solaris/native/sun/awt/awt_InputMethod.c
> +--- openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Mon Sep 27 13:38:49 2010 +0400
> ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Mon Sep 27 11:30:03 2010 -0400
> +@@ -1473,6 +1473,10 @@
> + static void DestroyXIMCallback(XIM im, XPointer client_data, XPointer call_data) {
> +     /* mark that XIM server was destroyed */
> +     X11im = NULL;
> ++    JNIEnv* env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
> ++    /* free the old pX11IMData and set it to null. this also avoids crashing
> ++     * the jvm if the XIM server reappears */
> ++    X11InputMethodData *pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
> + }
> + 
> + /*


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37