Fix out of bounds memory access bug in split_by_ascii_whitespace()

Akuli · Dec 23, 2023 · 74ba02f · 74ba02f
1 parent ca81368
commit 74ba02f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/stdlib/ascii.jou b/stdlib/ascii.jou
@@ -77,7 +77,7 @@ def split_by_ascii_whitespace(s: byte*) -> byte**:
             break
         *result_ptr++ = s
 
-        while not is_ascii_whitespace(*s):
+        while *s != '\0' and not is_ascii_whitespace(*s):
             s++
 
         if *s == '\0':

diff --git a/tests/should_succeed/ascii_test.jou b/tests/should_succeed/ascii_test.jou
@@ -53,4 +53,15 @@ def main() -> int:
         puts(words[i])
     free(words)
 
+    s = ""
+    words = split_by_ascii_whitespace(s)
+    assert words[0] == NULL
+    free(words)
+
+    s = "test1 test2"
+    words = split_by_ascii_whitespace(s)
+    printf("%s %s\n", words[0], words[1])  # Output: test1 test2
+    assert words[2] == NULL
+    free(words)
+
     return 0