FIX: crash when used protect/words/deep with block of values which ar…

…e not series fixes: Oldes/Rebol-issues#2417
Oldes · Apr 27, 2020 · e128def · e128def
1 parent d378e7f
commit e128def
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/core/n-control.c b/src/core/n-control.c
@@ -176,8 +176,10 @@ enum {
 		Protect_Word(wrd, flags);
 		if (GET_FLAG(flags, PROT_DEEP)) {
 			val = Get_Var(word);
-			Protect_Value(val, flags);
-			Unmark(val);
+			if(!IS_SCALAR(val)) {
+				Protect_Value(val, flags);
+				Unmark(val);
+			}
 		}
 	}
 	else if (ANY_PATH(word)) {

diff --git a/src/tests/units/crash-test.r3 b/src/tests/units/crash-test.r3
@@ -92,6 +92,15 @@ Rebol [
 	;@@ https://github.com/Oldes/Rebol-issues/issues/261
 	--assert percent? p: to percent! to decimal! #{7FEFFFFFFFFFFFFF} ;- no crash
 	--assert #{7FEFFFFFFFFFFFFF} = to binary! to decimal! p
+
+--test-- "issue-2417"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/2417
+	--assert block? protect/words [aaaa]
+	--assert block? protect/words/deep [bbbb]         ;- no crash
+	cccc: 1
+	dddd: 2
+	--assert block? protect/words [cccc]
+	--assert block? protect/words/deep [dddd] ;- no crash
 ===end-group===
 
 ~~~end-file~~~