|
 |
1feee8 |
commit 6ff61a51459d141782fbcc32ae81c0ef1954dad6
|
|
|
1feee8 |
Author: Joseph Myers <joseph@codesourcery.com>
|
|
|
1feee8 |
Date: Mon Oct 4 19:10:43 2021 +0000
|
|
|
1feee8 |
|
|
|
1feee8 |
Fix stdio-common tests for GCC 12 -Waddress
|
|
|
1feee8 |
|
|
|
1feee8 |
My glibc bot shows failures building the testsuite with GCC mainline
|
|
|
1feee8 |
across all architectures:
|
|
|
1feee8 |
|
|
|
1feee8 |
tst-vfprintf-width-prec.c: In function 'do_test':
|
|
|
1feee8 |
tst-vfprintf-width-prec.c:90:16: error: the comparison will always evaluate as 'false' for the address of 'result' will never be NULL [-Werror=address]
|
|
|
1feee8 |
90 | if (result == NULL)
|
|
|
1feee8 |
| ^~
|
|
|
1feee8 |
tst-vfprintf-width-prec.c:89:13: note: 'result' declared here
|
|
|
1feee8 |
89 | wchar_t result[100];
|
|
|
1feee8 |
| ^~~~~~
|
|
|
1feee8 |
|
|
|
1feee8 |
This is clearly a correct warning; the comparison against NULL is
|
|
|
1feee8 |
clearly a cut-and-paste mistake from an earlier case in the test that
|
|
|
1feee8 |
does use calloc. Thus, remove the unnecessary check for NULL shown up
|
|
|
1feee8 |
by the warning.
|
|
|
1feee8 |
|
|
|
1feee8 |
Similarly, two other tests have bogus comparisons against NULL; remove
|
|
|
1feee8 |
those as well:
|
|
|
1feee8 |
|
|
|
1feee8 |
scanf14a.c:95:13: error: the comparison will always evaluate as 'false' for the address of 'fname' will never be NULL [-Werror=address]
|
|
|
1feee8 |
95 | if (fname == NULL)
|
|
|
1feee8 |
| ^~
|
|
|
1feee8 |
scanf14a.c:93:8: note: 'fname' declared here
|
|
|
1feee8 |
93 | char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"];
|
|
|
1feee8 |
| ^~~~~
|
|
|
1feee8 |
|
|
|
1feee8 |
scanf16a.c:125:13: error: the comparison will always evaluate as 'false' for the address of 'fname' will never be NULL [-Werror=address]
|
|
|
1feee8 |
125 | if (fname == NULL)
|
|
|
1feee8 |
| ^~
|
|
|
1feee8 |
scanf16a.c:123:8: note: 'fname' declared here
|
|
|
1feee8 |
123 | char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"];
|
|
|
1feee8 |
| ^~~~~
|
|
|
1feee8 |
|
|
|
1feee8 |
Tested with build-many-glibcs.py (GCC mainline) for aarch64-linux-gnu.
|
|
|
1feee8 |
|
|
|
1feee8 |
(cherry picked from commit a312e8fe6d89f5eae6a4583d5db577121e61c0b5)
|
|
|
1feee8 |
|
|
|
1feee8 |
diff --git a/stdio-common/scanf14a.c b/stdio-common/scanf14a.c
|
|
|
1feee8 |
index 12adcff5a4970da1..b37712d1c673fa3a 100644
|
|
|
1feee8 |
--- a/stdio-common/scanf14a.c
|
|
|
1feee8 |
+++ b/stdio-common/scanf14a.c
|
|
|
1feee8 |
@@ -92,8 +92,6 @@ main (void)
|
|
|
1feee8 |
|
|
|
1feee8 |
char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"];
|
|
|
1feee8 |
sprintf (fname, "%s/tst-scanf14.XXXXXX", tmpdir);
|
|
|
1feee8 |
- if (fname == NULL)
|
|
|
1feee8 |
- FAIL ();
|
|
|
1feee8 |
|
|
|
1feee8 |
/* Create a temporary file. */
|
|
|
1feee8 |
int fd = mkstemp (fname);
|
|
|
1feee8 |
diff --git a/stdio-common/scanf16a.c b/stdio-common/scanf16a.c
|
|
|
1feee8 |
index 400d85a54e81c3cb..74d0295c97f73b14 100644
|
|
|
1feee8 |
--- a/stdio-common/scanf16a.c
|
|
|
1feee8 |
+++ b/stdio-common/scanf16a.c
|
|
|
1feee8 |
@@ -122,8 +122,6 @@ main (void)
|
|
|
1feee8 |
|
|
|
1feee8 |
char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"];
|
|
|
1feee8 |
sprintf (fname, "%s/tst-scanf16.XXXXXX", tmpdir);
|
|
|
1feee8 |
- if (fname == NULL)
|
|
|
1feee8 |
- FAIL ();
|
|
|
1feee8 |
|
|
|
1feee8 |
/* Create a temporary file. */
|
|
|
1feee8 |
int fd = mkstemp (fname);
|
|
|
1feee8 |
diff --git a/stdio-common/tst-vfprintf-width-prec.c b/stdio-common/tst-vfprintf-width-prec.c
|
|
|
1feee8 |
index 3192fd797ad4ea90..278d57f739f576e9 100644
|
|
|
1feee8 |
--- a/stdio-common/tst-vfprintf-width-prec.c
|
|
|
1feee8 |
+++ b/stdio-common/tst-vfprintf-width-prec.c
|
|
|
1feee8 |
@@ -87,12 +87,6 @@ do_test (void)
|
|
|
1feee8 |
}
|
|
|
1feee8 |
{
|
|
|
1feee8 |
wchar_t result[100];
|
|
|
1feee8 |
- if (result == NULL)
|
|
|
1feee8 |
- {
|
|
|
1feee8 |
- printf ("error: calloc (%d, %zu): %m", ret + 1, sizeof (wchar_t));
|
|
|
1feee8 |
- return 1;
|
|
|
1feee8 |
- }
|
|
|
1feee8 |
-
|
|
|
1feee8 |
ret = swprintf (result, 100, L"%133000.999999999x", 17);
|
|
|
1feee8 |
if (ret >= 0)
|
|
|
1feee8 |
{
|