diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkEvent.c | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2009-01-11 George Peter Staplin <georgeps@users.sourceforge.net> + + * generic/tkEvent.c: Fix a possible segv due to a NULL + pointer dereference that occurs when XCreateIC fails. + 2009-01-11 Pat Thoyts <patthoyts@users.sourceforge.net> * library/bgerror.tcl: Pretty up the unix tk_messageBox 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. */ |