diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-04-22 13:22:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-04-22 13:22:20 (GMT) |
| commit | 8e06fd796be19c40e0e82a7d9c9e54d34e975504 (patch) | |
| tree | 1f5c600fce4cc1e96f2664bb6e4125912342035a | |
| parent | ae76fbd559e8e30a6cb4c448bf4c924cbd79841b (diff) | |
| download | tcl-8e06fd796be19c40e0e82a7d9c9e54d34e975504.zip tcl-8e06fd796be19c40e0e82a7d9c9e54d34e975504.tar.gz tcl-8e06fd796be19c40e0e82a7d9c9e54d34e975504.tar.bz2 | |
[46a2410650] compiled [unset] was bypassing cleanup of active array search.
Overdue thanks to Andy Goth for tests and report.
| -rw-r--r-- | generic/tclExecute.c | 3 | ||||
| -rw-r--r-- | tests/var.test | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 5bc5c2d..af44323 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -4169,7 +4169,8 @@ TEBCresume( } TRACE(("%s %u \"%.30s\" => ", (flags ? "normal" : "noerr"), opnd, O2S(part2Ptr))); - if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr)) { + if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr) + && !(arrayPtr->flags & VAR_SEARCH_ACTIVE)) { varPtr = VarHashFindVar(arrayPtr->value.tablePtr, part2Ptr); if (varPtr && TclIsVarDirectUnsettable(varPtr)) { /* diff --git a/tests/var.test b/tests/var.test index b235e5d..8d86fce 100644 --- a/tests/var.test +++ b/tests/var.test @@ -776,6 +776,22 @@ test var-13.1 {Tcl_UnsetVar2, unset array with trace set on element} -setup { } set x "If you see this, it worked" } -result "If you see this, it worked" +test var-13.2 {unset array with search, bug 46a2410650} -body { + apply {{} { + array set a {aa 11 bb 22 cc 33 dd 44 ee 55 ff 66} + set s [array startsearch a] + unset a([array nextelement a $s]) + array nextelement a $s + }} +} -returnCodes error -result {couldn't find search "s-1-a"} +test var-13.3 {unset array with search, SIGSEGV, bug 46a2410650} -body { + apply {{} { + array set a {aa 11 bb 22 cc 33 dd 44 ee 55 ff 66} + set s [array startsearch a] + unset a(ff) + array nextelement a $s + }} +} -returnCodes error -result {couldn't find search "s-1-a"} test var-14.1 {array names syntax} -body { array names foo bar baz snafu |