summaryrefslogtreecommitdiffstats
path: root/generic/tclAssembly.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-05-13 16:03:59 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-05-13 16:03:59 (GMT)
commitf707c50e9de66076850124c7a59eadf465bfa76d (patch)
tree32b0a3c1f3a6ab43e1db5c28de85ffde5fa163ae /generic/tclAssembly.c
parent6c3864d50e67e78a0f42fdf677ccba994a66dfe2 (diff)
parent3a20c7912b73ddd6dac080f250140bd0f3a90672 (diff)
downloadtcl-f707c50e9de66076850124c7a59eadf465bfa76d.zip
tcl-f707c50e9de66076850124c7a59eadf465bfa76d.tar.gz
tcl-f707c50e9de66076850124c7a59eadf465bfa76d.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclAssembly.c')
-rw-r--r--generic/tclAssembly.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index b07333a..a0a6061 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -3983,10 +3983,12 @@ UnstackExpiredCatches(
while (catchDepth > bbPtr->catchDepth) {
--catchDepth;
- range = envPtr->exceptArrayPtr + catchIndices[catchDepth];
- range->numCodeBytes = bbPtr->startOffset - range->codeOffset;
- catches[catchDepth] = NULL;
- catchIndices[catchDepth] = -1;
+ if (catches[catchDepth] != NULL) {
+ range = envPtr->exceptArrayPtr + catchIndices[catchDepth];
+ range->numCodeBytes = bbPtr->startOffset - range->codeOffset;
+ catches[catchDepth] = NULL;
+ catchIndices[catchDepth] = -1;
+ }
}
/*