summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@wdc.com>2020-08-31 14:26:47 +0100
committerJoseph Myers <joseph@codesourcery.com>2020-09-07 17:01:06 +0000
commit3357087b2a95a33dbb38579c9bf7b23f1f85c7a1 (patch)
treea286e80adaa7f74aa4caa80176e666412ee4db90 /string
parent7b51d9f69e742d29b335f4ced07ed0f191b12f82 (diff)
downloadglibc-3357087b2a95a33dbb38579c9bf7b23f1f85c7a1.tar.gz
glibc-3357087b2a95a33dbb38579c9bf7b23f1f85c7a1.tar.xz
glibc-3357087b2a95a33dbb38579c9bf7b23f1f85c7a1.zip
string: Fix GCC 11 `-Werror=stringop-overread' error
Fix a compilation error:

In function '__rawmemchr',
    inlined from '__rawmemchr' at rawmemchr.c:27:1:
rawmemchr.c:36:12: error: 'memchr' specified bound 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overread]
   36 |     return memchr (s, c, (size_t)-1);
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
../o-iterator.mk:9: recipe for target '.../string/rawmemchr.o' failed

introduced with GCC 11 commit d14c547abd48 ("Add -Wstringop-overread
for reading past the end by string functions.").
Diffstat (limited to 'string')
-rw-r--r--string/rawmemchr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/string/rawmemchr.c b/string/rawmemchr.c
index b62d285d7e..d6ce8209be 100644
--- a/string/rawmemchr.c
+++ b/string/rawmemchr.c
@@ -32,6 +32,10 @@ RAWMEMCHR (const void *s, int c)
      PTRDIFF_MAX; the use of SIZE_MAX is deliberate here.  */
   DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow=");
 #endif
+#if __GNUC_PREREQ (11, 0)
+  /* Likewise GCC 11, with a different warning option.  */
+  DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
+#endif
   if (c != '\0')
     return memchr (s, c, (size_t)-1);
   DIAG_POP_NEEDS_COMMENT;