diff options
| author | hobbs <hobbs> | 2003-11-12 00:07:42 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2003-11-12 00:07:42 (GMT) |
| commit | 459cac7ed25678462be3072d2b7047b512d49a4c (patch) | |
| tree | d24a6858b1fe0f26e48f8ddcb8ebeea5765656f7 /generic/tkButton.c | |
| parent | f3c26a85fc9a60851d8901e96fa51034440aed3b (diff) | |
| download | tk-459cac7ed25678462be3072d2b7047b512d49a4c.zip tk-459cac7ed25678462be3072d2b7047b512d49a4c.tar.gz tk-459cac7ed25678462be3072d2b7047b512d49a4c.tar.bz2 | |
* generic/tkButton.c (ConfigureButton): abort option processing if
the button was deleted. [Bug #824479]
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 640921f..bfd5010 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.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: tkButton.c,v 1.21 2003/04/26 02:59:20 hobbs Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.22 2003/11/12 00:07:42 hobbs Exp $ */ #include "tkButton.h" @@ -1080,6 +1080,13 @@ ConfigureButton(interp, butPtr, objc, objv) Tk_RestoreSavedOptions(&savedOptions); } + if ((butPtr->flags & BUTTON_DELETED)) { + /* + * Somehow button was deleted - just abort now. [Bug #824479] + */ + return TCL_ERROR; + } + /* * A few options need special processing, such as setting the * background from a 3-D border, or filling in complicated |