← Back to branch summary

~ubuntu-branches/ubuntu/breezy/libx11/breezy

« back to all changes in this revision

Viewing changes to debian/patches/086_fix_SEGV_in_ximcp.diff

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Stone
  • Date: 2005-09-30 16:30:55 UTC
  • Revision ID: james.westby@ubuntu.com-20050930163055-dfterq3qv2h111u0
Tags: 1:6.2.1+cvs.20050722-8
Fix non-UTF-8 locales by fixing generation of compose.dir, locale.alias,
and locale.dir in nls/ (closes: Ubuntu#13724).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/086_fix_SEGV_in_ximcp.diff
 
1
$Id$
 
2
 
 
3
Fixes SEGV in _XimRegisterKeyPressFilter() if _XimProtoCreateIC() failed to
 
4
create an input context.  See Debian #239991.
 
5
 
 
6
This patch by Chung-chieh Shan.
 
7
 
 
8
Not submitted to XFree86.
 
9
 
 
10
--- xc/lib/X11/imDefIc.c~       2004-04-21 12:09:52.000000000 -0500
 
11
+++ xc/lib/X11/imDefIc.c        2004-04-21 12:10:17.000000000 -0500
 
12
@@ -1546,6 +1546,7 @@
 
13
     return (XIC)ic;
 
14
 
 
15
 ErrorOnCreatingIC:
 
16
+    _XimUnregisterFilter(ic);
 
17
     if (ic->private.proto.ic_resources)
 
18
        Xfree(ic->private.proto.ic_resources);
 
19
     if (ic->private.proto.ic_inner_resources)