summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorgeorgeps <georgeps>2009-01-11 19:05:17 (GMT)
committergeorgeps <georgeps>2009-01-11 19:05:17 (GMT)
commit191e0d652ef5f96562b77df1262200dcf070dd2c (patch)
treec5a9e0756685eb30be669c950a7c698ded9ced84 /generic
parent0259d48cd6dbd441eca1064f0c594f9305b2b15d (diff)
downloadtk-191e0d652ef5f96562b77df1262200dcf070dd2c.zip
tk-191e0d652ef5f96562b77df1262200dcf070dd2c.tar.gz
tk-191e0d652ef5f96562b77df1262200dcf070dd2c.tar.bz2
* generic/tkEvent.c: Fix a possible segv due to a NULL
pointer dereference that occurs when XCreateIC fails.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkEvent.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 13e1304..bcadee5 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkEvent.c,v 1.38 2008/12/28 22:59:47 dkf Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.39 2009/01/11 19:05:17 georgeps Exp $
*/
#include "tkInt.h"
@@ -353,6 +353,12 @@ CreateXIC(
XFree(preedit_attlist);
}
+
+ if (winPtr->inputContext == NULL) {
+ /* XCreateIC failed. */
+ return;
+ }
+
/*
* Adjust the window's event mask if the IM requires it.
*/