diff options
| author | gahr <gahr@gahr.ch> | 2016-05-23 11:40:10 (GMT) |
|---|---|---|
| committer | gahr <gahr@gahr.ch> | 2016-05-23 11:40:10 (GMT) |
| commit | 7e85a50a4670f3fe470935a933aaaecda3ab615b (patch) | |
| tree | bf6524a31d689158f8511caf4f7c943f452ae213 /generic/tclAssembly.c | |
| parent | 8e26969a348df5ec51f430e4eb408579a49aef52 (diff) | |
| parent | 0e5bc322f1164f51b9d9714a4a012b5519542876 (diff) | |
| download | tcl-7e85a50a4670f3fe470935a933aaaecda3ab615b.zip tcl-7e85a50a4670f3fe470935a933aaaecda3ab615b.tar.gz tcl-7e85a50a4670f3fe470935a933aaaecda3ab615b.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclAssembly.c')
| -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 4ad31d2..8dd23a0 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -3982,10 +3982,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; + } } /* |