diff options
| -rw-r--r-- | generic/tclCmdIL.c | 16 | ||||
| -rw-r--r-- | tests/info.test | 8 |
2 files changed, 14 insertions, 10 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 0d88044..3742ba9 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -1201,9 +1201,6 @@ InfoFrameCmd( } framePtr = iPtr->cmdFramePtr; - if (!framePtr) { - goto levelError; - } while (++level <= 0) { framePtr = framePtr->nextPtr; if (!framePtr) { @@ -1272,9 +1269,14 @@ TclInfoFrame( static const char *const typeString[TCL_LOCATION_LAST] = { "eval", "eval", "eval", "precompiled", "source", "proc" }; - Proc *procPtr = framePtr->framePtr ? framePtr->framePtr->procPtr : NULL; + Proc *procPtr = NULL; int needsFree = -1; + if (!framePtr) { + goto precompiled; + } + procPtr = framePtr->framePtr ? framePtr->framePtr->procPtr : NULL; + /* * Pull the information and construct the dictionary to return, as list. * Regarding use of the CmdFrame fields see tclInt.h, and its definition. @@ -1302,11 +1304,11 @@ TclInfoFrame( break; case TCL_LOCATION_PREBC: + precompiled: /* * Precompiled. Result contains the type as signal, nothing else. */ - - ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1)); + ADD_PAIR("type", Tcl_NewStringObj(typeString[TCL_LOCATION_PREBC], -1)); break; case TCL_LOCATION_BC: { @@ -1421,7 +1423,7 @@ TclInfoFrame( * _visible_ CallFrame. */ - if ((framePtr->framePtr != NULL) && (iPtr->varFramePtr != NULL)) { + if (framePtr && (framePtr->framePtr != NULL) && (iPtr->varFramePtr != NULL)) { CallFrame *current = framePtr->framePtr; CallFrame *top = iPtr->varFramePtr; CallFrame *idx; diff --git a/tests/info.test b/tests/info.test index e4d9c89..38fa5f2 100644 --- a/tests/info.test +++ b/tests/info.test @@ -2597,12 +2597,14 @@ test info-40.0 {Bug 0de6c1d79c crash} -setup { child hide info } -body { list [child invokehidden info frame] \ - [catch {child invokehidden info frame 0} msg] $msg \ - [catch {child invokehidden info frame 1} msg] $msg + [child invokehidden info frame 0] \ + [child invokehidden info frame 1] \ + [catch {child invokehidden info frame -1} msg] $msg \ + [catch {child invokehidden info frame 2} msg] $msg } -cleanup { interp delete child unset -nocomplain msg -} -result {1 1 {bad level "0"} 1 {bad level "1"}} +} -result {1 {type precompiled} {type precompiled} 1 {bad level "-1"} 1 {bad level "2"}} # cleanup catch {namespace delete test_ns_info1 test_ns_info2} |