diff options
| author | jvoisin | 2026-04-30 17:42:29 +0200 |
|---|---|---|
| committer | jvoisin | 2026-04-30 17:42:29 +0200 |
| commit | f9239e2c0f0be9856322727887a45333683940a6 (patch) | |
| tree | 714b611965666c4072fef6218e7a794dff1884cb /tests/test_wcsnrtombs_dynamic.c | |
| parent | 6040b4a27409968c764353a98c45d972cfd89a8a (diff) | |
Fix a bug in wcsnrtombs
__d is a char * destination buffer, so __b is already the byte capacity.
Dividing by sizeof(wchar_t) makes no sense here, it was likely copy-pasted
from mbsnrtowcs (where the destination is wchar_t *). The first branch also
fails to limit __n (the byte write cap) to __b, so overflows are possible when
a wide character produces multi-byte output. The second branch (else) correctly
limits __n to __b.
This commit replaces the broken two-branch logic with the simple correct
pattern matching wcsrtombs, and adds two tests two prove that nothing broke.
Diffstat (limited to 'tests/test_wcsnrtombs_dynamic.c')
| -rw-r--r-- | tests/test_wcsnrtombs_dynamic.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/tests/test_wcsnrtombs_dynamic.c b/tests/test_wcsnrtombs_dynamic.c new file mode 100644 index 0000000..808c9c8 --- /dev/null +++ b/tests/test_wcsnrtombs_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 | char buffer[8] = {0}; | ||
| 8 | const wchar_t src[] = L"ABCD"; | ||
| 9 | const wchar_t *srcp = src; | ||
| 10 | mbstate_t st; | ||
| 11 | memset(&st, 0, sizeof(st)); | ||
| 12 | |||
| 13 | /* Safe: convert up to 4 wide chars, write at most 4 bytes */ | ||
| 14 | srcp = src; | ||
| 15 | wcsnrtombs(buffer, &srcp, 4, 4, &st); | ||
| 16 | |||
| 17 | /* Unsafe: ask to write argc (10) bytes into 8-byte buffer. | ||
| 18 | * Before the fix, the first branch incorrectly divided the byte-sized | ||
| 19 | * buffer capacity by sizeof(wchar_t), making the check too permissive. */ | ||
| 20 | CHK_FAIL_START | ||
| 21 | srcp = src; | ||
| 22 | memset(&st, 0, sizeof(st)); | ||
| 23 | wcsnrtombs(buffer, &srcp, 4, argc, &st); | ||
| 24 | CHK_FAIL_END | ||
| 25 | |||
| 26 | puts(buffer); | ||
| 27 | return ret; | ||
| 28 | } | ||
