diff options
author | Stefan Liebler <stli@linux.ibm.com> | 2019-06-19 12:32:04 +0200 |
---|---|---|
committer | Stefan Liebler <stli@linux.ibm.com> | 2019-06-19 12:32:04 +0200 |
commit | f0c5a803bdefd15079d23db4ac5c3b9ba1cc2f10 (patch) | |
tree | a6d1b406e45af713d9ac363d912b28c7a253e19d /benchtests | |
parent | fabf5e49ddd61312027de8e92cc1b8528c2a929d (diff) | |
download | glibc-f0c5a803bdefd15079d23db4ac5c3b9ba1cc2f10.zip glibc-f0c5a803bdefd15079d23db4ac5c3b9ba1cc2f10.tar.gz glibc-f0c5a803bdefd15079d23db4ac5c3b9ba1cc2f10.tar.bz2 |
Fix gcc 9 build errors for make xcheck. [BZ #24556]
This patch fixes the following gcc 9 warnings for "make xcheck" / "make bench":
-string/tst-strcasestr.c:
../include/bits/../../misc/bits/error.h:42:5: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-argp/argp-test.c:
argp-test.c:130:20: error: ‘%d’ directive writing between 1 and 11 bytes into a region of size 10 [-Werror=format-overflow=]
argp-test.c:130:19: note: directive argument in the range [-2147483648, 122]
argp-test.c:130:5: note: ‘sprintf’ output between 2 and 12 bytes into a destination of size 10
-nss/tst-field.c:
tst-field.c:52:7: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-benchtests/bench-strstr.c:
../include/bits/../../misc/bits/error.h:42:5: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-benchtests/bench-malloc-simple.c:
bench-malloc-simple.c:93:16: error: iteration 3 invokes undefined behavior [-Werror=aggressive-loop-optimizations]
ChangeLog:
[BZ #24556]
* string/test-strcasestr.c (check_result): Add NULL check.
* nss/tst-field.c (check_rewrite): Likewise.
* benchtests/bench-strstr.c (do_one_test): Likewise.
* string/test-strstr.c (check_result): Likewise.
* argp/argp-test.c (popt): Increase size of buf to 12.
* benchtests/bench-malloc-simple.c (bench):
Do not initialize tests array out of bounds.
Diffstat (limited to 'benchtests')
-rw-r--r-- | benchtests/bench-malloc-simple.c | 2 | ||||
-rw-r--r-- | benchtests/bench-strstr.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/benchtests/bench-malloc-simple.c b/benchtests/bench-malloc-simple.c index b8bb2cc..c4f06f6 100644 --- a/benchtests/bench-malloc-simple.c +++ b/benchtests/bench-malloc-simple.c @@ -87,7 +87,7 @@ bench (unsigned long size) size_t iters = NUM_ITERS; int **arr = (int**) malloc (MAX_ALLOCS * sizeof (void*)); - for (int t = 0; t <= 3; t++) + for (int t = 0; t < 3; t++) for (int i = 0; i < NUM_ALLOCS; i++) { tests[t][i].n = allocs[i]; diff --git a/benchtests/bench-strstr.c b/benchtests/bench-strstr.c index 2cbe13e..89d1755 100644 --- a/benchtests/bench-strstr.c +++ b/benchtests/bench-strstr.c @@ -147,7 +147,8 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) if (res != exp_result) { error (0, 0, "Wrong result in function %s %s %s", impl->name, - res, exp_result); + (res == NULL) ? "(null)" : res, + (exp_result == NULL) ? "(null)" : exp_result); ret = 1; } } |