diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-08-18 08:49:55 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-12-12 15:40:20 +0100 |
| commit | b30518eedbce705f9f34970ff459083d738d2e36 (patch) | |
| tree | 28c7c95320f1123e38cde445a4f43b9622c4f59a /libio/tst_swprintf.c | |
| parent | 45234c5d6ba9556451424940fa746e9e66b1a6f4 (diff) | |
| download | glibc-fw/vfprintf-2.tar.xz glibc-fw/vfprintf-2.zip | |
libio: Convert __vswprintf_internal to buffers (bug 27857)fw/vfprintf-2
Always null-terminate the buffer and set E2BIG if the buffer is too
small. This fixes bug 27857.
Diffstat (limited to 'libio/tst_swprintf.c')
| -rw-r--r-- | libio/tst_swprintf.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/libio/tst_swprintf.c b/libio/tst_swprintf.c index 1f997b9393..169951de4b 100644 --- a/libio/tst_swprintf.c +++ b/libio/tst_swprintf.c @@ -1,4 +1,5 @@ #include <array_length.h> +#include <errno.h> #include <stdio.h> #include <support/check.h> #include <sys/types.h> @@ -37,6 +38,8 @@ do_test (void) for (n = 0; n < array_length (tests); ++n) { + wmemset (buf, 0xabcd, array_length (buf)); + errno = 0; ssize_t res = swprintf (buf, tests[n].n, L"%s", tests[n].str); if (tests[n].exp < 0 && res >= 0) @@ -52,9 +55,31 @@ do_test (void) swprintf (buf, %zu, L\"%%s\", \"%s\") expected to return %zd, but got %zd\n", tests[n].n, tests[n].str, tests[n].exp, res); } - else - printf ("swprintf (buf, %zu, L\"%%s\", \"%s\") OK\n", - tests[n].n, tests[n].str); + else if (res < 0 + && tests[n].n > 0 + && wcsnlen (buf, array_length (buf)) == array_length (buf)) + { + support_record_failure (); + printf ("\ +error: swprintf (buf, %zu, L\"%%s\", \"%s\") missing null terminator\n", + tests[n].n, tests[n].str); + } + else if (res < 0 + && tests[n].n > 0 + && wcsnlen (buf, array_length (buf)) < array_length (buf) + && buf[wcsnlen (buf, array_length (buf)) + 1] != 0xabcd) + { + support_record_failure (); + printf ("\ +error: swprintf (buf, %zu, L\"%%s\", \"%s\") out of bounds write\n", + tests[n].n, tests[n].str); + } + + if (res < 0 && tests[n].n < 0) + TEST_COMPARE (errno, E2BIG); + + printf ("swprintf (buf, %zu, L\"%%s\", \"%s\") OK\n", + tests[n].n, tests[n].str); } TEST_COMPARE (swprintf (buf, array_length (buf), L"%.0s", "foo"), 0); |