FIX: crash in enline

related to: zsx#16 (cherry picked from commit 11a9478)
Oldes · Jun 2, 2020 · 70c51ba · 70c51ba
1 parent 9cf326b
commit 70c51ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/core/s-ops.c b/src/core/s-ops.c
@@ -458,10 +458,11 @@ static REBYTE seed_str[SEED_LEN] = {
 	// Add missing CRs:
 	while (cnt > 0) {
 		bp[tail--] = bp[len]; // Copy src to dst.
-		if (bp[len--] == LF && bp[len] != CR) {
+		if (bp[len] == LF && (len == 0 || bp[len - 1] != CR)) {
 			bp[tail--] = CR;
 			cnt--;
 		}
+		len--;
 	}
 }
 
@@ -495,10 +496,11 @@ static REBYTE seed_str[SEED_LEN] = {
 	// Add missing CRs:
 	while (cnt > 0) {
 		bp[tail--] = bp[len]; // Copy src to dst.
-		if (bp[len--] == LF && bp[len] != CR) {
+		if (bp[len] == LF && (len == 0 || bp[len - 1] != CR)) {
 			bp[tail--] = CR;
 			cnt--;
 		}
+		len--;
 	}
 }
 

diff --git a/src/tests/units/crash-test.r3 b/src/tests/units/crash-test.r3
@@ -125,6 +125,10 @@ Rebol [
 	;@@ https://github.com/Oldes/Rebol-issues/issues/1514
 	--assert error? try [try/except [1 / 0] :add] ;- no crash
 
+--test-- {enline "^/"}
+	--assert string? enline "^/"  ;- no crash
+	--assert string? enline "^/č" ;- no crash (unicode version)
+
 ===end-group===
 
 ~~~end-file~~~