AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-12 12:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable -Wformat-overflow= warnings for some printf tests.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2018-11-01 17:13:55 +00:00
parent daea71c2e4
commit 6f30e59fc9
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2018-11-01 Joseph Myers <joseph@codesourcery.com> 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] [BZ #23848]
* sysdeps/unix/sysv/linux/sparc/kernel-features.h [!__arch64__ && * sysdeps/unix/sysv/linux/sparc/kernel-features.h [!__arch64__ &&
__LINUX_KERNEL_VERSION < 0x040400] (__ASSUME_SENDMSG_SYSCALL): __LINUX_KERNEL_VERSION < 0x040400] (__ASSUME_SENDMSG_SYSCALL):

22
stdio-common/bug22.c
View File

@ -1,6 +1,7 @@
/* BZ #5424 */ /* BZ #5424 */
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <libc-diag.h>
/* INT_MAX + 1 */ /* INT_MAX + 1 */
#define N 2147483648 #define N 2147483648
@ -30,12 +31,26 @@ do_test (void)
return 1; 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); ret = fprintf (fp, "%" SN "d", 1);
DIAG_POP_NEEDS_COMMENT;
printf ("ret = %d\n", ret); printf ("ret = %d\n", ret);
if (ret != -1 || errno != EOVERFLOW) if (ret != -1 || errno != EOVERFLOW)
return 1; 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); ret = fprintf (fp, "%." SN "d", 1);
DIAG_POP_NEEDS_COMMENT;
printf ("ret = %d\n", ret); printf ("ret = %d\n", ret);
if (ret != -1 || errno != EOVERFLOW) if (ret != -1 || errno != EOVERFLOW)
return 1; return 1;
@ -45,7 +60,14 @@ do_test (void)
if (ret != -1 || errno != EOVERFLOW) if (ret != -1 || errno != EOVERFLOW)
return 1; 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); ret = fprintf (fp, "%" SN2 "d%" SN2 "d", 1, 1);
DIAG_POP_NEEDS_COMMENT;
printf ("ret = %d\n", ret); printf ("ret = %d\n", ret);
return ret != -1 || errno != EOVERFLOW; return ret != -1 || errno != EOVERFLOW;

7
stdio-common/tst-printf.c
View File

@ -110,7 +110,14 @@ I am ready for my first lesson today.";
printf("left-adjusted Z string:\t\"%-010s\"\n", shortstr); printf("left-adjusted Z string:\t\"%-010s\"\n", shortstr);
printf("space-padded string:\t\"%10s\"\n", shortstr); printf("space-padded string:\t\"%10s\"\n", shortstr);
printf("left-adjusted S 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); printf("null string:\t\"%s\"\n", (char *)NULL);
DIAG_POP_NEEDS_COMMENT;
printf("limited string:\t\"%.22s\"\n", longstr); printf("limited string:\t\"%.22s\"\n", longstr);
printf("a-style max:\t\"%a\"\n", DBL_MAX); printf("a-style max:\t\"%a\"\n", DBL_MAX);