From bc771adc8abb68ed5ba880ee894607dc3209ec95 Mon Sep 17 00:00:00 2001 From: Miguel Sofer Date: Wed, 3 Oct 2007 12:53:11 +0000 Subject: * generic/tclObj.c (Tcl_FindCommandFromObj): fix finding a deleted command; cannot trigger this from Tcl itself, but crash reported on xotcl. This check is new to 8.4 but exists in 8.5, so this is a backport or something. Thanks Gustaf Neumann. --- ChangeLog | 7 +++++++ generic/tclObj.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b298155..09aab5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-03 Miguel Sofer + + * generic/tclObj.c (Tcl_FindCommandFromObj): fix finding a deleted + command; cannot trigger this from Tcl itself, but crash reported + on xotcl. This check is new to 8.4 but exists in 8.5, so this is a + backport or something. Thanks Gustaf Neumann. + 2007-10-02 Jeff Hobbs * generic/tcl.h (Tcl_DecrRefCount): Update change from 2006-05-29 diff --git a/generic/tclObj.c b/generic/tclObj.c index 092dc1a..16454ac 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.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: tclObj.c,v 1.42.2.15 2007/09/13 15:28:13 das Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.42.2.16 2007/10/03 12:53:12 msofer Exp $ */ #include "tclInt.h" @@ -3015,7 +3015,8 @@ Tcl_GetCommandFromObj(interp, objPtr) && (resPtr->refNsId == currNsPtr->nsId) && (resPtr->refNsCmdEpoch == currNsPtr->cmdRefEpoch)) { cmdPtr = resPtr->cmdPtr; - if (cmdPtr->cmdEpoch != resPtr->cmdEpoch) { + if (cmdPtr->cmdEpoch != resPtr->cmdEpoch + || (cmdPtr->flags & CMD_IS_DELETED)) { cmdPtr = NULL; } } -- cgit v0.12