Author: branden
Date: 2004-04-21 12:21:10 -0500 (Wed, 21 Apr 2004)
New Revision: 1296
Added:
trunk/debian/patches/086_fix_SEGV_in_ximcp.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
Fix _XimProtoCreateIC() to call _XimUnregisterFilter() on errors creating
the input context. Prevents a SEGV in the ximcp Xlib module (thanks,
Chung-chieh Shan). (Closes: #239991)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-04-21 16:58:06 UTC (rev 1295)
+++ trunk/debian/TODO 2004-04-21 17:21:10 UTC (rev 1296)
@@ -2,7 +2,6 @@
4.3.0.dfsg.1-1 née 4.3.0-8
==========================
-* #239991: Fix SEGV in xc/lib/X11/imDefIc.c:_XimRegisterKeyPressFilter().
* #147898: xlibs: select() hangs in XDrawString16() when using TrueType with
Xinerama; [fix for deadlock in libXi -- patch included]
* #222804: xlibs: [xkb] proposed symbol mapping for Compaq Evo
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-21 16:58:06 UTC (rev 1295)
+++ trunk/debian/changelog 2004-04-21 17:21:10 UTC (rev 1296)
@@ -285,8 +285,12 @@
xserver-xfree86/config/inputdevice/keyboard/options template (thanks,
Denis Barbier).
- -- Branden Robinson <branden@debian.org> Wed, 21 Apr 2004 03:21:33 -0500
+ * Fix _XimProtoCreateIC() to call _XimUnregisterFilter() on errors creating
+ the input context. Prevents a SEGV in the ximcp Xlib module (thanks,
+ Chung-chieh Shan). (Closes: #239991)
+ -- Branden Robinson <branden@debian.org> Wed, 21 Apr 2004 12:16:54 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/086_fix_SEGV_in_ximcp.diff
===================================================================
--- trunk/debian/patches/086_fix_SEGV_in_ximcp.diff 2004-04-21 16:58:06 UTC (rev 1295)
+++ trunk/debian/patches/086_fix_SEGV_in_ximcp.diff 2004-04-21 17:21:10 UTC (rev 1296)
@@ -0,0 +1,19 @@
+$Id$
+
+Fixes SEGV in _XimRegisterKeyPressFilter() if _XimProtoCreateIC() failed to
+create an input context. See Debian #239991.
+
+This patch by Chung-chieh Shan.
+
+Not submitted to XFree86.
+
+--- xc/lib/X11/imDefIc.c~ 2004-04-21 12:09:52.000000000 -0500
++++ xc/lib/X11/imDefIc.c 2004-04-21 12:10:17.000000000 -0500
+@@ -1591,6 +1591,7 @@
+ return (XIC)ic;
+
+ ErrorOnCreatingIC:
++ _XimUnregisterFilter(ic);
+ if (ic->private.proto.ic_resources)
+ Xfree(ic->private.proto.ic_resources);
+ if (ic->private.proto.ic_inner_resources)
Property changes on: trunk/debian/patches/086_fix_SEGV_in_ximcp.diff
___________________________________________________________________
Name: svn:keywords
+ Id