summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2006-04-05 17:16:28 (GMT)
committervincentdarley <vincentdarley>2006-04-05 17:16:28 (GMT)
commit3bdb973764ec36da1e05c457c564a66210d9de52 (patch)
treeaa106cbf489f4de5403824144abb3c9d31434a87
parent1563393aa453cc39f727115207662e041768972f (diff)
downloadtk-3bdb973764ec36da1e05c457c564a66210d9de52.zip
tk-3bdb973764ec36da1e05c457c564a66210d9de52.tar.gz
tk-3bdb973764ec36da1e05c457c564a66210d9de52.tar.bz2
fix to crash in test suite, with dump -command
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkText.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 827078c..4316841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-05 Vince Darley <vincentdarley@users.sourceforge.net>
+
+ * generic/tkText.c: fix to crash caused on some platforms
+ by new tests introduced to check for [Bug 1414171], which
+ destroy the text widget in the dump callback script.
+
2006-03-29 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tkOption.c (TkOptionDeadWindow): handle
diff --git a/generic/tkText.c b/generic/tkText.c
index fb45e66..aeb40bb 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkText.c,v 1.67 2006/03/28 19:26:52 vincentdarley Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.68 2006/04/05 17:16:29 vincentdarley Exp $
*/
#include "default.h"
@@ -4803,7 +4803,8 @@ DumpSegment(textPtr, interp, key, value, command, index, what)
list = Tcl_Merge(3, argv);
Tcl_VarEval(interp, Tcl_GetString(command), " ", list, NULL);
ckfree(list);
- if (TkBTreeEpoch(textPtr->sharedTextPtr->tree) != oldStateEpoch) {
+ if ((textPtr->flags & DESTROYED)
+ || (TkBTreeEpoch(textPtr->sharedTextPtr->tree) != oldStateEpoch)) {
return 1;
} else {
return 0;