diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | generic/tclProc.c | 12 |
2 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2005-02-02 Mo DeJong <mdejong@users.sourceforge.net> + + * generic/tclProc.c (TclInitCompiledLocals): + Add check for type of the framePtr->procPtr->bodyPtr + passed to TclInitCompiledLocals and panic if + it is not the correct type. If the body of the proc + is not of the compiled byte code type then the + code will crash. This was discovered while tracking + down a crash in Itcl, that crash is fixed by + Itcl patch 1115085. + 2005-02-01 Don Porter <dgp@users.sourceforge.net> * generic/tclExecute.c (TclCompEvalObj): Removed stray statement diff --git a/generic/tclProc.c b/generic/tclProc.c index 54e1572..4d9e7e0 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclProc.c,v 1.72 2004/12/24 18:07:01 msofer Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.73 2005/02/02 23:09:06 mdejong Exp $ */ #include "tclInt.h" @@ -1051,10 +1051,16 @@ TclInitCompiledLocals(interp, framePtr, nsPtr) Namespace *nsPtr; /* Pointer to current namespace. */ { Var *varPtr = framePtr->compiledLocals; - ByteCode *codePtr = (ByteCode *) - framePtr->procPtr->bodyPtr->internalRep.otherValuePtr; + Tcl_Obj *bodyPtr; + ByteCode *codePtr; CompiledLocal *localPtr = framePtr->procPtr->firstLocalPtr; + bodyPtr = framePtr->procPtr->bodyPtr; + if (bodyPtr->typePtr != &tclByteCodeType) { + Tcl_Panic("body object for proc attached to frame is not a byte code type"); + } + codePtr = (ByteCode *) bodyPtr->internalRep.otherValuePtr; + InitCompiledLocals(interp, codePtr, localPtr, varPtr, nsPtr); } |