diff options
| author | jvoisin | 2026-04-30 18:06:56 +0200 |
|---|---|---|
| committer | jvoisin | 2026-04-30 18:06:56 +0200 |
| commit | d6105aba5fd791e8d3f069e771517cdb947b5604 (patch) | |
| tree | bbafa423c172a0a0d63edf3aa0e0334fd798f085 /tests | |
| parent | 7fecafe015505c0ebd47780050118ff789a9ae3f (diff) | |
Fix mbsnrtowcs
mbsnrtowcs writes up to __wn wide characters into wchar_t *__d. The destination
capacity is __b / sizeof(wchar_t) wide characters, but the
else branch clamps __n (source byte limit) to __b (destination byte size).
__wn (the actual output count) is passed through unclamped. Example: __b=8
(dest holds 2 wchar_t), __n=100, __wn=25. The else branch applies (25 <=
100/4), clamps source to 8 bytes, but passes __wn=25 — the function can write
25 wchar_t (100 bytes) into an 8-byte buffer.
The first branch is also wrong: it divides __b (bytes) by sizeof(wchar_t) to
get wchar_t capacity, which is correct for the destination — but the condition
__wn > __n / sizeof(wchar_t) uses integer division that can produce incorrect
routing between branches.
The fix mirrors the already-correct mbsrtowcs pattern: clamp __wn (the output
wide-char count) to the destination's wchar_t capacity, and pass __n (source
byte limit) through unchanged.
Diffstat (limited to '')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | tests/test_mbsnrtowcs_dynamic.c | 28 | ||||
| -rw-r--r-- | tests/test_mbsnrtowcs_static.c | 26 |
3 files changed, 56 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 9fc8287..6904b2d 100644 --- a/tests/Makefile +++ b/tests/Makefile | |||
| @@ -50,6 +50,8 @@ RUNTIME_TARGETS= \ | |||
| 50 | test_mempcpy_static_write \ | 50 | test_mempcpy_static_write \ |
| 51 | test_memset_dynamic_write \ | 51 | test_memset_dynamic_write \ |
| 52 | test_memset_static_write \ | 52 | test_memset_static_write \ |
| 53 | test_mbsnrtowcs_dynamic \ | ||
| 54 | test_mbsnrtowcs_static \ | ||
| 53 | test_poll_dynamic \ | 55 | test_poll_dynamic \ |
| 54 | test_poll_static \ | 56 | test_poll_static \ |
| 55 | test_ppoll_dynamic \ | 57 | test_ppoll_dynamic \ |
diff --git a/tests/test_mbsnrtowcs_dynamic.c b/tests/test_mbsnrtowcs_dynamic.c new file mode 100644 index 0000000..77b9082 --- /dev/null +++ b/tests/test_mbsnrtowcs_dynamic.c | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | #include "common.h" | ||
| 2 | |||
| 3 | #include <wchar.h> | ||
| 4 | #include <string.h> | ||
| 5 | |||
| 6 | int main(int argc, char** argv) { | ||
| 7 | wchar_t buffer[4] = {0}; | ||
| 8 | const char *src = "ABCDEFGHIJ"; | ||
| 9 | const char *srcp = src; | ||
| 10 | mbstate_t st; | ||
| 11 | memset(&st, 0, sizeof(st)); | ||
| 12 | |||
| 13 | /* Safe: convert up to 2 source bytes into at most 2 wide chars */ | ||
| 14 | srcp = src; | ||
| 15 | mbsnrtowcs(buffer, &srcp, 2, 2, &st); | ||
| 16 | |||
| 17 | /* Unsafe: ask to write argc (10) wide chars into 4-element buffer. | ||
| 18 | * Before the fix, the else branch clamped source bytes instead of | ||
| 19 | * the output wide-char count, allowing destination overflow. */ | ||
| 20 | CHK_FAIL_START | ||
| 21 | srcp = src; | ||
| 22 | memset(&st, 0, sizeof(st)); | ||
| 23 | mbsnrtowcs(buffer, &srcp, 10, argc, &st); | ||
| 24 | CHK_FAIL_END | ||
| 25 | |||
| 26 | printf("%ls\n", buffer); | ||
| 27 | return ret; | ||
| 28 | } | ||
diff --git a/tests/test_mbsnrtowcs_static.c b/tests/test_mbsnrtowcs_static.c new file mode 100644 index 0000000..755d453 --- /dev/null +++ b/tests/test_mbsnrtowcs_static.c | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | #include "common.h" | ||
| 2 | |||
| 3 | #include <wchar.h> | ||
| 4 | #include <string.h> | ||
| 5 | |||
| 6 | int main(int argc, char** argv) { | ||
| 7 | wchar_t buffer[4] = {0}; | ||
| 8 | const char *src = "ABCDEFGHIJKLMNOP"; | ||
| 9 | const char *srcp = src; | ||
| 10 | mbstate_t st; | ||
| 11 | memset(&st, 0, sizeof(st)); | ||
| 12 | |||
| 13 | /* Safe: convert up to 4 source bytes into at most 2 wide chars */ | ||
| 14 | srcp = src; | ||
| 15 | mbsnrtowcs(buffer, &srcp, 4, 2, &st); | ||
| 16 | |||
| 17 | /* Unsafe: ask to write 16 wide chars into 4-element buffer */ | ||
| 18 | CHK_FAIL_START | ||
| 19 | srcp = src; | ||
| 20 | memset(&st, 0, sizeof(st)); | ||
| 21 | mbsnrtowcs(buffer, &srcp, 16, 16, &st); | ||
| 22 | CHK_FAIL_END | ||
| 23 | |||
| 24 | printf("%ls\n", buffer); | ||
| 25 | return ret; | ||
| 26 | } | ||
