diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-11-01 17:13:55 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-11-01 17:13:55 +0000 |
| commit | 6f30e59fc9d9945a225de9b2c7b260ff64e72140 (patch) | |
| tree | a89ad093455035b0846c3ec851f2144cc764e57a | |
| parent | daea71c2e4234e8c7ed78ce3d980b25f63744a14 (diff) | |
| download | glibc-6f30e59fc9d9945a225de9b2c7b260ff64e72140.tar.gz glibc-6f30e59fc9d9945a225de9b2c7b260ff64e72140.tar.xz glibc-6f30e59fc9d9945a225de9b2c7b260ff64e72140.zip | |
Disable -Wformat-overflow= warnings for some printf tests.
Recent GCC -Wformat-overflow= changes result in some printf tests failing to build, because those tests are deliberately testing the handling of formats writing more than INT_MAX characters and the handling of NULL arguments to the %s format, which GCC now warns about. This patch duly disables -Wformat-overflow= for the relevant calls to printf functions. Tested with build-many-glibcs.py with GCC mainline for aarch64-linux-gnu. * stdio-common/bug22.c: Include <libc-diag.h>. (do_test): Disable -Wformat-overflow= warnings around fprintf calls outputting more than INT_MAX characters. * stdio-common/tst-printf.c: Disable -Wformat-overflow= warnings around printf call with NULL %s argument.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | stdio-common/bug22.c | 22 | ||||
| -rw-r--r-- | stdio-common/tst-printf.c | 7 |
3 files changed, 35 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 96f6ce52d8..0c6b43ebc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2018-11-01 Joseph Myers <joseph@codesourcery.com> + * stdio-common/bug22.c: Include <libc-diag.h>. + (do_test): Disable -Wformat-overflow= warnings around fprintf + calls outputting more than INT_MAX characters. + * stdio-common/tst-printf.c: Disable -Wformat-overflow= warnings + around printf call with NULL %s argument. + [BZ #23848] * sysdeps/unix/sysv/linux/sparc/kernel-features.h [!__arch64__ && __LINUX_KERNEL_VERSION < 0x040400] (__ASSUME_SENDMSG_SYSCALL): diff --git a/stdio-common/bug22.c b/stdio-common/bug22.c index b26399acb7..b3d48eb8e1 100644 --- a/stdio-common/bug22.c +++ b/stdio-common/bug22.c @@ -1,6 +1,7 @@ /* BZ #5424 */ #include <stdio.h> #include <errno.h> +#include <libc-diag.h> /* INT_MAX + 1 */ #define N 2147483648 @@ -30,12 +31,26 @@ do_test (void) return 1; } + /* GCC 9 warns about output of more than INT_MAX characters; this is + deliberately tested here. */ + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + DIAG_IGNORE_NEEDS_COMMENT (9, "-Wformat-overflow="); +#endif ret = fprintf (fp, "%" SN "d", 1); + DIAG_POP_NEEDS_COMMENT; printf ("ret = %d\n", ret); if (ret != -1 || errno != EOVERFLOW) return 1; + /* GCC 9 warns about output of more than INT_MAX characters; this is + deliberately tested here. */ + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + DIAG_IGNORE_NEEDS_COMMENT (9, "-Wformat-overflow="); +#endif ret = fprintf (fp, "%." SN "d", 1); + DIAG_POP_NEEDS_COMMENT; printf ("ret = %d\n", ret); if (ret != -1 || errno != EOVERFLOW) return 1; @@ -45,7 +60,14 @@ do_test (void) if (ret != -1 || errno != EOVERFLOW) return 1; + /* GCC 9 warns about output of more than INT_MAX characters; this is + deliberately tested here. */ + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + DIAG_IGNORE_NEEDS_COMMENT (9, "-Wformat-overflow="); +#endif ret = fprintf (fp, "%" SN2 "d%" SN2 "d", 1, 1); + DIAG_POP_NEEDS_COMMENT; printf ("ret = %d\n", ret); return ret != -1 || errno != EOVERFLOW; diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c index 70d9e584b3..e4f4f1624d 100644 --- a/stdio-common/tst-printf.c +++ b/stdio-common/tst-printf.c @@ -110,7 +110,14 @@ I am ready for my first lesson today."; printf("left-adjusted Z string:\t\"%-010s\"\n", shortstr); printf("space-padded string:\t\"%10s\"\n", shortstr); printf("left-adjusted S string:\t\"%-10s\"\n", shortstr); + /* GCC 9 warns about the NULL format argument; this is deliberately + tested here. */ + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + DIAG_IGNORE_NEEDS_COMMENT (9, "-Wformat-overflow="); +#endif printf("null string:\t\"%s\"\n", (char *)NULL); + DIAG_POP_NEEDS_COMMENT; printf("limited string:\t\"%.22s\"\n", longstr); printf("a-style max:\t\"%a\"\n", DBL_MAX); |