lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

String: Strength memset tests in test-memset.c

Browse Source 
The prior sentinel logic was broken and was checking the SIMPLE_MEMSET
as opposed to the tested implementation. As well `s` (the test buffer)
was not reset between implementation tests so it was possible for a
buggy implementation to be hidden by a previously executed correct
one.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Noah Goldstein
2022-02-13 19:40:37 -06:00
parent a5659cf27d
commit 0281c7a7ec
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
string/test-memset.c
View File

@@ -106,26 +106,28 @@ SIMPLE_MEMSET (CHAR *s, int c, size_t n)
} }
static void static void
do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n) do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n, int space_below, int space_above)
{ {
CHAR buf[n + 2]; CHAR buf[n];
CHAR *tstbuf = buf + 1; CHAR sentinel = ~c;
CHAR sentinel = c - 1; if (space_below)
buf[0] = sentinel; s[-1] = sentinel;
buf[n + 1] = sentinel; if (space_above)
s[n] = sentinel;
SIMPLE_MEMSET(s, ~c, n);
#ifdef TEST_BZERO #ifdef TEST_BZERO
simple_bzero (tstbuf, n); simple_bzero (buf, n);
CALL (impl, s, n); CALL (impl, s, n);
if (memcmp (s, tstbuf, n) != 0 if (memcmp (s, buf, n) != 0
|| buf[0] != sentinel || (space_below && s[-1] != sentinel)
|| buf[n + 1] != sentinel) || (space_above && s[n] != sentinel))
#else #else
CHAR *res = CALL (impl, s, c, n); CHAR *res = CALL (impl, s, c, n);
if (res != s if (res != s
|| SIMPLE_MEMSET (tstbuf, c, n) != tstbuf || SIMPLE_MEMSET (buf, c, n) != buf
|| MEMCMP (s, tstbuf, n) != 0 || MEMCMP (s, buf, n) != 0
|| buf[0] != sentinel || (space_below && s[-1] != sentinel)
|| buf[n + 1] != sentinel) || (space_above && s[n] != sentinel))
#endif /* !TEST_BZERO */ #endif /* !TEST_BZERO */
{ {
error (0, 0, "Wrong result in function %s", impl->name); error (0, 0, "Wrong result in function %s", impl->name);
@@ -137,12 +139,16 @@ do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n)
static void static void
do_test (size_t align, int c, size_t len) do_test (size_t align, int c, size_t len)
{ {
int space_below, space_above;
align &= 4095; align &= 4095;
if ((align + len) * sizeof (CHAR) > page_size) if ((align + len) * sizeof (CHAR) > page_size)
return; return;
space_below = !!align;
space_above = !((align + len + 1) * sizeof (CHAR) > page_size);
FOR_EACH_IMPL (impl, 0) FOR_EACH_IMPL (impl, 0)
do_one_test (impl, (CHAR *) (buf1) + align, c, len); do_one_test (impl, (CHAR *) (buf1) + align, c, len, space_below, space_above);
} }
#ifndef TEST_BZERO #ifndef TEST_BZERO