diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-05-13 15:55:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-05-13 15:55:44 (GMT) |
| commit | a03fb962566180610243462d6b2b9bd44c64de07 (patch) | |
| tree | 6f04b84654774b908bade009de80e7b8b75aaf96 /generic | |
| parent | 67801a78ad4a2571cbdb9f8358f88edc001776dc (diff) | |
| parent | 79cda12010d970f8602ad38d1adbb788b1a7888e (diff) | |
| download | tcl-a03fb962566180610243462d6b2b9bd44c64de07.zip tcl-a03fb962566180610243462d6b2b9bd44c64de07.tar.gz tcl-a03fb962566180610243462d6b2b9bd44c64de07.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclAssembly.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c index 6d5676b..f56da8f 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -3984,10 +3984,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; + } } /* |