diff options
| author | dgp <dgp@users.sourceforge.net> | 2010-03-30 16:30:13 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2010-03-30 16:30:13 (GMT) |
| commit | 36a7f1eef38266693086f5e322db122fd9469b20 (patch) | |
| tree | 346b9fcef9cb7f9b28327700acd68636e89b251e /generic/tclObj.c | |
| parent | c839e018aafb94be00950841cdd249804cb02305 (diff) | |
| download | tcl-36a7f1eef38266693086f5e322db122fd9469b20.zip tcl-36a7f1eef38266693086f5e322db122fd9469b20.tar.gz tcl-36a7f1eef38266693086f5e322db122fd9469b20.tar.bz2 | |
* generic/tclObj.c (Tcl_GetCommandFromObj): [Bug 2979402]: Reorder
the validity tests on internal rep of a "cmdName" value to avoid
invalid reads reported by valgrind.
Diffstat (limited to 'generic/tclObj.c')
| -rw-r--r-- | generic/tclObj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 56db483..5c48b0d 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.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: tclObj.c,v 1.139.2.7 2009/12/10 19:13:15 andreas_kupries Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.139.2.8 2010/03/30 16:30:13 dgp Exp $ */ #include "tclInt.h" @@ -4055,8 +4055,8 @@ Tcl_GetCommandFromObj( if ((objPtr->typePtr != &tclCmdNameType) || (resPtr == NULL) || (cmdPtr = resPtr->cmdPtr, cmdPtr->cmdEpoch != resPtr->cmdEpoch) - || (interp != cmdPtr->nsPtr->interp) || (cmdPtr->flags & CMD_IS_DELETED) + || (interp != cmdPtr->nsPtr->interp) || (cmdPtr->nsPtr->flags & NS_DYING) || ((resPtr->refNsPtr != NULL) && (((refNsPtr = (Namespace *) TclGetCurrentNamespace(interp)) |