diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-02-13 19:40:37 -0600 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-02-15 11:25:04 -0600 |
| commit | 0281c7a7ec8f3f46d8e6f5f3d7fca548946dbfce (patch) | |
| tree | 415ac37ce28a290d81238b6a1cad2b423184f9a4 /string | |
| parent | a5659cf27d3ce6101c1632715d18ab6321755340 (diff) | |
| download | glibc-0281c7a7ec8f3f46d8e6f5f3d7fca548946dbfce.tar.gz glibc-0281c7a7ec8f3f46d8e6f5f3d7fca548946dbfce.tar.xz glibc-0281c7a7ec8f3f46d8e6f5f3d7fca548946dbfce.zip | |
String: Strength memset tests in test-memset.c
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>
Diffstat (limited to 'string')
| -rw-r--r-- | string/test-memset.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/string/test-memset.c b/string/test-memset.c index 8498b1bc97..ee548f6924 100644 --- a/string/test-memset.c +++ b/string/test-memset.c @@ -106,26 +106,28 @@ SIMPLE_MEMSET (CHAR *s, int c, size_t n) } 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 *tstbuf = buf + 1; - CHAR sentinel = c - 1; - buf[0] = sentinel; - buf[n + 1] = sentinel; + CHAR buf[n]; + CHAR sentinel = ~c; + if (space_below) + s[-1] = sentinel; + if (space_above) + s[n] = sentinel; + SIMPLE_MEMSET(s, ~c, n); #ifdef TEST_BZERO - simple_bzero (tstbuf, n); + simple_bzero (buf, n); CALL (impl, s, n); - if (memcmp (s, tstbuf, n) != 0 - || buf[0] != sentinel - || buf[n + 1] != sentinel) + if (memcmp (s, buf, n) != 0 + || (space_below && s[-1] != sentinel) + || (space_above && s[n] != sentinel)) #else CHAR *res = CALL (impl, s, c, n); if (res != s - || SIMPLE_MEMSET (tstbuf, c, n) != tstbuf - || MEMCMP (s, tstbuf, n) != 0 - || buf[0] != sentinel - || buf[n + 1] != sentinel) + || SIMPLE_MEMSET (buf, c, n) != buf + || MEMCMP (s, buf, n) != 0 + || (space_below && s[-1] != sentinel) + || (space_above && s[n] != sentinel)) #endif /* !TEST_BZERO */ { 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 do_test (size_t align, int c, size_t len) { + int space_below, space_above; align &= 4095; if ((align + len) * sizeof (CHAR) > page_size) return; + space_below = !!align; + space_above = !((align + len + 1) * sizeof (CHAR) > page_size); + 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 |