From 74169f648996a1a44c2767f53e3fe57482665f3a Mon Sep 17 00:00:00 2001 From: "jenglish@flightlab.com" Date: Mon, 31 May 2010 17:35:29 +0000 Subject: Tk_CreateBinding): Silently ignore empty scripts (Fixes [Bug 3006842]). --- ChangeLog | 5 +++++ generic/tkBind.c | 8 ++++++-- 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 + + * generic/tkBind.c(Tk_CreateBinding): Silently ignore empty + scripts (Fixes [Bug 3006842]). + 2010-05-27 Joe English * 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. -- cgit v0.12