diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2002-03-27 14:35:40 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2002-03-27 14:35:40 (GMT) |
| commit | e64c93e702240e727b329082367fb89cbe994591 (patch) | |
| tree | fb25550d63d8991150f460cf93bd1a4df7b4e854 /generic | |
| parent | 5003cf213ea8c44687443350d6c1c10d691dad4e (diff) | |
| download | tcl-e64c93e702240e727b329082367fb89cbe994591.zip tcl-e64c93e702240e727b329082367fb89cbe994591.tar.gz tcl-e64c93e702240e727b329082367fb89cbe994591.tar.bz2 | |
avoid exceptional returns at level 0 [Bug 219181]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 3f4c5d6..5a4424b 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.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: tclBasic.c,v 1.53 2002/03/25 16:35:14 msofer Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.54 2002/03/27 14:35:40 msofer Exp $ */ #include "tclInt.h" @@ -3585,6 +3585,16 @@ Tcl_EvalEx(interp, script, numBytes, flags) iPtr->numLevels--; } if (code != TCL_OK) { + if (iPtr->numLevels == 0) { + if (code == TCL_RETURN) { + code = TclUpdateReturnInfo(iPtr); + } + if ((code != TCL_OK) && (code != TCL_ERROR) + && ((iPtr->evalFlags & TCL_ALLOW_EXCEPTIONS) == 0)) { + ProcessUnexpectedResult(interp, code); + code = TCL_ERROR; + } + } goto error; } for (i = 0; i < objectsUsed; i++) { |