@@ -199,6 +199,7 @@ tests := \
tst-strfry \
tst-strlcat \
tst-strlcpy \
+ tst-strlcpy2 \
tst-strlen \
tst-strtok \
tst-strtok_r \
new file mode 100644
@@ -0,0 +1,322 @@
+/* Test strlcpy functions.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#define TEST_MAIN
+#ifndef WIDE
+# define TEST_NAME "strlcpy"
+#else
+# define TEST_NAME "wcslcpy"
+#endif /* WIDE */
+#include "test-string.h"
+
+#ifdef WIDE
+# include <wchar.h>
+# define BIG_CHAR WCHAR_MAX
+# define CHAR wchar_t
+# define MEMCMP wmemcmp
+# define MEMSET wmemset
+# define SIMPLE_STRLCPY simple_wcslcpy
+# define SMALL_CHAR 1273
+# define STRLCPY wcslcpy
+# define STRLEN wcslen
+#else
+# define BIG_CHAR CHAR_MAX
+# define CHAR char
+# define MEMCMP memcmp
+# define MEMSET memset
+# define SIMPLE_STRLCPY simple_strlcpy
+# define SMALL_CHAR 127
+# define STRLCPY strlcpy
+# define STRLEN strlen
+#endif /* !WIDE */
+
+/* Naive implementation to verify results. */
+size_t
+SIMPLE_STRLCPY (CHAR *dst, const CHAR *src, size_t n)
+{
+ size_t ret = STRLEN (src);
+
+ if (!n)
+ return ret;
+
+ while (--n)
+ if ((*dst++ = *src++) == '\0')
+ return ret;
+ *dst = '\0';
+ return ret;
+}
+
+IMPL (SIMPLE_STRLCPY, 0)
+IMPL (STRLCPY, 1)
+
+typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t);
+
+static void
+do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t len, size_t n)
+{
+ if (CALL (impl, dst, src, n) != len)
+ {
+ error (0, 0, "Wrong result in function %s %zd %zd", impl->name,
+ CALL (impl, dst, src, n), len);
+ ret = 1;
+ return;
+ }
+
+ if (n == 0)
+ return;
+
+ len = (len >= n ? n - 1 : len);
+ if (MEMCMP (dst, src, len) != 0)
+ {
+ error (0, 0, "Wrong result in function1 %s", impl->name);
+ ret = 1;
+ return;
+ }
+
+ if (dst [len] != '\0')
+ {
+ error (0, 0, "Wrong result in function2 %s", impl->name);
+ ret = 1;
+ return;
+ }
+}
+
+static void
+do_test (size_t align1, size_t align2, size_t len, size_t n, int max_char)
+{
+ size_t i;
+ CHAR *s1, *s2;
+
+ /* For wcslcpy: align1 and align2 here mean alignment not in bytes,
+ but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)). */
+ align1 &= 7;
+ if ((align1 + len) * sizeof (CHAR) >= page_size)
+ return;
+
+ align2 &= 7;
+ if ((align2 + len) * sizeof (CHAR) >= page_size)
+ return;
+
+ s1 = (CHAR *) (buf1) + align1;
+ s2 = (CHAR *) (buf2) + align2;
+
+ for (i = 0; i < len; ++i)
+ s1[i] = 32 + 23 * i % (max_char - 32);
+ s1[len] = 0;
+
+ FOR_EACH_IMPL (impl, 0)
+ do_one_test (impl, s2, s1, len, n);
+}
+
+static void
+do_page_tests (void)
+{
+ CHAR *s1, *s2;
+ const size_t maxoffset = 64;
+
+ /* Put s1 at the maxoffset from the edge of buf1's last page. */
+ s1 = (CHAR *) buf1 + BUF1PAGES * page_size / sizeof(CHAR) - maxoffset;
+ /* s2 needs room to put a string with size of maxoffset + 1 at s2 +
+ (maxoffset - 1). */
+ s2 = (CHAR *) buf2 + page_size / sizeof(CHAR) - maxoffset * 2;
+
+ MEMSET (s1, 'a', maxoffset - 1);
+ s1[maxoffset - 1] = '\0';
+
+ /* Both strings are bounded to a page with read/write access and the next
+ page is protected with PROT_NONE (meaning that any access outside of the
+ page regions will trigger an invalid memory access).
+
+ The loop copies the string s1 for all possible offsets up to maxoffset
+ for both inputs with a size larger than s1 (so memory access outside the
+ expected memory regions might trigger invalid access). */
+
+ for (size_t off1 = 0; off1 < maxoffset; off1++)
+ {
+ for (size_t off2 = 0; off2 < maxoffset; off2++)
+ {
+ FOR_EACH_IMPL (impl, 0)
+ do_one_test (impl, s2 + off2, s1 + off1, maxoffset - off1 - 1,
+ maxoffset + (maxoffset - off2));
+ }
+ }
+}
+
+static void
+do_random_tests (void)
+{
+ size_t i, j, n, align1, align2, len, size, mode;
+ CHAR *p1 = (CHAR *) (buf1 + page_size) - 1024;
+ CHAR *p2 = (CHAR *) (buf2 + page_size) - 1024;
+ size_t res;
+
+ for (n = 0; n < ITERATIONS; n++)
+ {
+ /* For wcslcpy: align1 and align2 here mean align not in bytes,
+ but in wchar_ts, in bytes it will equal to align * (sizeof
+ (wchar_t)). */
+
+ mode = random ();
+ if (mode & 1)
+ {
+ size = random () & 255;
+ align1 = 512 - size - (random () & 15);
+ if (mode & 2)
+ align2 = align1 - (random () & 24);
+ else
+ align2 = align1 - (random () & 31);
+ if (mode & 4)
+ {
+ j = align1;
+ align1 = align2;
+ align2 = j;
+ }
+ if (mode & 8)
+ len = size - (random () & 31);
+ else
+ len = 512;
+ if (len >= 512)
+ len = random () & 511;
+ }
+ else
+ {
+ align1 = random () & 31;
+ if (mode & 2)
+ align2 = random () & 31;
+ else
+ align2 = align1 + (random () & 24);
+ len = random () & 511;
+ j = align1;
+ if (align2 > j)
+ j = align2;
+ if (mode & 4)
+ {
+ size = random () & 511;
+ if (size + j > 512)
+ size = 512 - j - (random () & 31);
+ }
+ else
+ size = 512 - j;
+ if ((mode & 8) && len + j >= 512)
+ len = 512 - j - (random () & 7);
+ }
+ j = len + align1;
+ for (i = 0; i < j; i++)
+ {
+ p1[i] = random () & BIG_CHAR;
+ if (i >= align1 && i < len + align1 && !p1[i])
+ p1[i] = (random () & SMALL_CHAR) + 3;
+ }
+ p1[i] = 0;
+
+ FOR_EACH_IMPL (impl, 1)
+ {
+ MEMSET (p2 - 64, '\1', 512 + 64);
+ res = CALL (impl, (CHAR *) (p2 + align2),
+ (CHAR *) (p1 + align1), size);
+ if (res != len)
+ {
+ error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd) %zd != %zd",
+ n, impl->name, align1, align2, len, res);
+ ret = 1;
+ }
+ for (j = 0; j < align2 + 64; ++j)
+ {
+ if (p2[j - 64] != '\1')
+ {
+ error (0, 0, "Iteration %zd - garbage before, %s (%zd, %zd, %zd)",
+ n, impl->name, align1, align2, len);
+ ret = 1;
+ break;
+ }
+ }
+ j = align2 + len + 1;
+ if (size + align2 > j)
+ j = size + align2;
+ for (; j < 512; ++j)
+ {
+ if (p2[j] != '\1')
+ {
+ error (0, 0, "Iteration %zd - garbage after, %s (%zd, %zd, %zd)",
+ n, impl->name, align1, align2, len);
+ ret = 1;
+ break;
+ }
+ }
+ j = len;
+ /* Check for zero size. */
+ if (size)
+ {
+ if (size <= j)
+ j = size - 1;
+ if (MEMCMP (p1 + align1, p2 + align2, j))
+ {
+ error (0, 0, "Iteration %zd - different strings, %s (%zd, %zd, %zd)",
+ n, impl->name, align1, align2, len);
+ ret = 1;
+ }
+ if (p2[align2 + j])
+ {
+ error (0, 0, "Iteration %zd - garbage after size, %s (%zd, %zd, %zd)",
+ n, impl->name, align1, align2, len);
+ ret = 1;
+ break;
+ }
+ }
+ }
+ }
+}
+
+int
+test_main (void)
+{
+ size_t i;
+
+ test_init ();
+
+ printf ("%28s", "");
+ FOR_EACH_IMPL (impl, 0)
+ printf ("\t%s", impl->name);
+ putchar ('\n');
+
+ for (i = 1; i < 8; ++i)
+ {
+ do_test (i, i, 16, 16, SMALL_CHAR);
+ do_test (i, i, 16, 16, BIG_CHAR);
+ do_test (i, 2 * i, 16, 16, SMALL_CHAR);
+ do_test (2 * i, i, 16, 16, BIG_CHAR);
+ do_test (8 - i, 2 * i, 1 << i, 2 << i, SMALL_CHAR);
+ do_test (2 * i, 8 - i, 2 << i, 1 << i, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 1 << i, 2 << i, BIG_CHAR);
+ do_test (2 * i, 8 - i, 2 << i, 1 << i, BIG_CHAR);
+ }
+
+ for (i = 1; i < 8; ++i)
+ {
+ do_test (0, 0, 4 << i, 8 << i, SMALL_CHAR);
+ do_test (0, 0, 16 << i, 8 << i, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 4 << i, 8 << i, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 16 << i, 8 << i, SMALL_CHAR);
+ }
+
+ do_random_tests ();
+ do_page_tests ();
+ return ret;
+}
+
+#include <support/test-driver.c>
@@ -180,6 +180,7 @@ tests := \
tst-wcrtomb \
tst-wcslcat \
tst-wcslcpy \
+ tst-wcslcpy2 \
tst-wcsnlen \
tst-wcstod-nan-locale \
tst-wcstod-nan-sign \
new file mode 100644
@@ -0,0 +1,20 @@
+/* Test wcslcpy functions.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#define WIDE 1
+#include "../string/tst-strlcpy2.c"