summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2001-04-07 03:15:38 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2001-04-07 03:15:38 (GMT)
commitefadd9fc6a4ab636317014c0d288a78c4151664f (patch)
tree873bc5f90dbb128c2fdeff5fee278e6b6a11e1ee /generic/tclExecute.c
parentfc43ab2356c5126058af8392723740b01af546c5 (diff)
downloadtcl-efadd9fc6a4ab636317014c0d288a78c4151664f.zip
tcl-efadd9fc6a4ab636317014c0d288a78c4151664f.tar.gz
tcl-efadd9fc6a4ab636317014c0d288a78c4151664f.tar.bz2
Avoid panic when there are extra items in the tcl stack
[Bug #406709, Patch #414470]
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 2bd71f9..fcad4a5 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.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: tclExecute.c,v 1.20 2001/03/13 09:31:37 dkf Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.21 2001/04/07 03:15:38 msofer Exp $
*/
#include "tclInt.h"
@@ -635,11 +635,15 @@ TclExecuteByteCode(interp, codePtr)
Tcl_SetObjResult(interp, valuePtr);
TclDecrRefCount(valuePtr);
if (stackTop != initStackTop) {
- fprintf(stderr, "\nTclExecuteByteCode: done instruction at pc %u: stack top %d != entry stack top %d\n",
+ /*
+ * if extra items in the stack, clean up the stack before return
+ */
+ if (stackTop > initStackTop) goto abnormalReturn;
+ fprintf(stderr, "\nTclExecuteByteCode: done instruction at pc %u: stack top %d < entry stack top %d\n",
(unsigned int)(pc - codePtr->codeStart),
(unsigned int) stackTop,
(unsigned int) initStackTop);
- panic("TclExecuteByteCode execution failure: end stack top != start stack top");
+ panic("TclExecuteByteCode execution failure: end stack top < start stack top");
}
TRACE_WITH_OBJ(("=> return code=%d, result=", result),
iPtr->objResultPtr);