aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-11-14 17:50:36 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-11-14 17:50:36 +0000
commitec72135e5f1d061cb5cf7cd1b855fd6290be10d9 (patch)
tree11ddb5b9320af6b9b3d3361449db2f0d3e776f00
parenta259f5d388d6195da958b2d147d17c2e2d16b857 (diff)
downloadglibc-ec72135e5f1d061cb5cf7cd1b855fd6290be10d9.zip
glibc-ec72135e5f1d061cb5cf7cd1b855fd6290be10d9.tar.gz
glibc-ec72135e5f1d061cb5cf7cd1b855fd6290be10d9.tar.bz2
Fix string/bug-strncat1.c build with GCC 8.
GCC 8 warns about strncat calls with truncated output. string/bug-strncat1.c tests such a call; this patch disables the warning for it. Tested (compilation) with GCC 8 for x86_64-linux-gnu with build-many-glibcs.py (in conjunction with Martin's patch to allow glibc to build). * string/bug-strncat1.c: Include <libc-diag.h>. (main): Disable -Wstringop-truncation for strncat call for GCC 8.
-rw-r--r--ChangeLog5
-rw-r--r--string/bug-strncat1.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bc5ff14..579185d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-14 Joseph Myers <joseph@codesourcery.com>
+
+ * string/bug-strncat1.c: Include <libc-diag.h>.
+ (main): Disable -Wstringop-truncation for strncat call for GCC 8.
+
2017-11-13 Claude Paroz <claude@2xlibre.net>
[BZ #22387]
diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c
index f1b5c37..b22beba 100644
--- a/string/bug-strncat1.c
+++ b/string/bug-strncat1.c
@@ -4,13 +4,21 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <libc-diag.h>
char d[3] = "\0\1\2";
int
main (void)
{
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (8, 0)
+ /* GCC 8 warns about strncat truncating output; this is deliberately
+ tested here. */
+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation");
+#endif
strncat (d, "\5\6", 1);
+ DIAG_POP_NEEDS_COMMENT;
if (d[0] != '\5')
{
puts ("d[0] != '\\5'");