Reference ticket number in tests var-13.2 and var-13.3

Bug [46a2410650]: Create macro TclIsVarArraySearched to check if an array variable has an active search, and modify INST_UNSET_ARRAY to fall back on the slow unset method for array elements within an array being searched. The slow unset method involves a call to DeleteSearches() which stops all active searches.
Add test var-13.3 which is a more serious version of test var-13.2. var-13.3 is a SIGSEGV until we fix it.
2016-12-25 00:00:30 +00:00 · 2016-12-24 23:58:29 +00:00 · 2016-12-24 23:25:40 +00:00 · 2016-12-24 23:02:02 +00:00 · 2016-12-24 23:00:56 +00:00
3 changed files with 26 additions and 3 deletions
@@ -4034,12 +4034,13 @@ TEBCresume(
 	}
 	TRACE(("%s %u \"%.30s\" => ",
 		(flags ? "normal" : "noerr"), opnd, O2S(part2Ptr)));
-	if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr)) {
+	if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr)
+		&& !TclIsVarArraySearched(arrayPtr)) {
 	    varPtr = VarHashFindVar(arrayPtr->value.tablePtr, part2Ptr);
 	    if (varPtr && TclIsVarDirectUnsettable(varPtr)) {
 		/*
-		 * No nasty traces and element exists, so we can proceed to
-		 * unset it. Might still not exist though...
+		 * No nasty traces or searchesw and element exists, so we can
+		 * proceed to unset it. Might still not exist though...
 		 */

 		if (!TclIsVarUndefined(varPtr)) {
@@ -804,6 +804,7 @@ typedef struct VarInHash {
 * MODULE_SCOPE int	TclIsVarTemporary(Var *varPtr);
 * MODULE_SCOPE int	TclIsVarArgument(Var *varPtr);
 * MODULE_SCOPE int	TclIsVarResolved(Var *varPtr);
+ * MODULE_SCOPE int	TclIsVarArraySearched(Var *varPtr);
 */

 #define TclIsVarScalar(varPtr) \
@@ -845,6 +846,9 @@ typedef struct VarInHash {
 #define TclIsVarDeadHash(varPtr) \
    ((varPtr)->flags & VAR_DEAD_HASH)

+#define TclIsVarArraySearched(varPtr) \
+    ((varPtr)->flags & VAR_SEARCH_ACTIVE)
+
 #define TclGetVarNsPtr(varPtr) \
    (TclIsVarInHash(varPtr) \
 	? ((TclVarHashTable *) ((((VarInHash *) (varPtr))->entry.tablePtr)))->nsPtr \
@@ -778,6 +778,24 @@ 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
 } -returnCodes 1 -match glob -result *
Author	SHA1	Message	Date
andy	5d444e0610	Reference ticket number in tests var-13.2 and var-13.3	2016-12-25 00:00:30 +00:00
andy	cd9fecea9c	Bug [46a2410650]: Create macro TclIsVarArraySearched to check if an array variable has an active search, and modify INST_UNSET_ARRAY to fall back on the slow unset method for array elements within an array being searched. The slow unset method involves a call to DeleteSearches() which stops all active searches.	2016-12-24 23:58:29 +00:00
andy	17d343aa62	Add test var-13.3 which is a more serious version of test var-13.2. var-13.3 is a SIGSEGV until we fix it.	2016-12-24 23:25:40 +00:00
andy	f857e512dd	Merge trunk. Test var-13.2 now fails due to [af5c35971a].	2016-12-24 23:02:02 +00:00
andy	628009fb64	Add test var-13.2 to check that unsetting an array element terminates an array search. This behavior was broken by check-in [af5c35971a].	2016-12-24 23:00:56 +00:00