diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-11-14 17:50:36 +0000 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-10-22 14:16:02 +0200 |
| commit | 6ae2ca620a955f1e3465e58b5180c5a7fd596dd0 (patch) | |
| tree | 3c90de7e26acf1868056ade1f46477b50a176c3b | |
| parent | fe5978e1a5d7419de3a779823fb5ed0d1dcee8ff (diff) | |
| download | glibc-6ae2ca620a955f1e3465e58b5180c5a7fd596dd0.tar.gz glibc-6ae2ca620a955f1e3465e58b5180c5a7fd596dd0.tar.xz glibc-6ae2ca620a955f1e3465e58b5180c5a7fd596dd0.zip | |
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. (cherry picked from commit ec72135e5f1d061cb5cf7cd1b855fd6290be10d9)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string/bug-strncat1.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 65633dbc7f..d4223dbb9e 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. + 2018-06-14 Joseph Myers <joseph@codesourcery.com> * string/tester.c (test_strncat) [__GNUC_PREREQ (7, 0)]: Also diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c index f1b5c37c5c..b22beba4d3 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'"); |