Changeset 0600976 in mainline for uspace/lib/c/test/str.c

Timestamp:

2025-04-14T11:23:38Z (8 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

5d2bdaa

Parents:

11782da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-14 10:57:38)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-14 11:23:38)

Message:

Reject invalid non-shortest UTF-8 forms and fix some other issues in str

File:

• uspace/lib/c/test/str.c (modified) (2 diffs)

uspace/lib/c/test/str.c

@@ -27 +27 @@
  */
 
+#include "pcut/asserts.h"
 #include <stdio.h>
 #include <str.h>
@@ -115 +116 @@
 }
 
+PCUT_TEST(str_non_shortest)
+{
+        /* Overlong zero. */
+        const char overlong1[] = { 0b11000000, 0b10000000, 0 };
+        const char overlong2[] = { 0b11100000, 0b10000000, 0 };
+        const char overlong3[] = { 0b11110000, 0b10000000, 0 };
+
+        const char overlong4[] = { 0b11000001, 0b10111111, 0 };
+        const char overlong5[] = { 0b11100000, 0b10011111, 0b10111111, 0 };
+        const char overlong6[] = { 0b11110000, 0b10001111, 0b10111111, 0b10111111, 0 };
+
+        size_t offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong1, &offset, sizeof(overlong1)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong2, &offset, sizeof(overlong2)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong3, &offset, sizeof(overlong3)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong4, &offset, sizeof(overlong4)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong5, &offset, sizeof(overlong5)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong6, &offset, sizeof(overlong6)));
+
+        char sanitized[sizeof(overlong6)];
+        str_cpy(sanitized, STR_NO_LIMIT, overlong1);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong2);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong3);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong4);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong5);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong6);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+}
+
 PCUT_EXPORT(str);