summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2010-05-31 17:35:29 (GMT)
committerjenglish <jenglish@flightlab.com>2010-05-31 17:35:29 (GMT)
commit8aef287d1e78682504c84c81e646a42a6730939e (patch)
treebf07a038f028c29ed86bf2c97ed2a41b2e0fd2bd
parent8b2ea5bfb2f859daf2920244fbd3631913127cb1 (diff)
downloadtk-8aef287d1e78682504c84c81e646a42a6730939e.zip
tk-8aef287d1e78682504c84c81e646a42a6730939e.tar.gz
tk-8aef287d1e78682504c84c81e646a42a6730939e.tar.bz2
Tk_CreateBinding): Silently ignore empty scripts (Fixes [Bug 3006842]).
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkBind.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee9628b..9380d80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/tkBind.c(Tk_CreateBinding): Silently ignore empty
+ scripts (Fixes [Bug 3006842]).
+
2010-05-27 Joe English <jenglish@users.sourceforge.net>
* generic/ttk/ttkTreeview.c, tests/ttk/treeview.test:
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 67231cd..c610330 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkBind.c,v 1.65 2010/05/17 17:19:22 jenglish Exp $
+ * RCS: @(#) $Id: tkBind.c,v 1.66 2010/05/31 17:35:29 jenglish Exp $
*/
#include "tkInt.h"
@@ -958,6 +958,10 @@ Tk_CreateBinding(
unsigned long eventMask;
char *newStr, *oldStr;
+ if (!*script) {
+ /* Silently ignore empty scripts -- see SF#3006842 */
+ return 1;
+ }
psPtr = FindSequence(interp, &bindPtr->patternTable, object, eventString,
1, 1, &eventMask);
if (psPtr == NULL) {
@@ -1019,7 +1023,7 @@ Tk_CreateBinding(
/*
*---------------------------------------------------------------------------
*
- * TkCreateBindingFunction --
+ * TkCreateBindingProcedure --
*
* Add a C binding to a binding table, so that future calls to
* Tk_BindEvent may callback the function in the binding.