mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 20:51:11 +00:00
f0c5a803bd
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.
104 lines
3.1 KiB
C
104 lines
3.1 KiB
C
/* Test for invalid field handling in file-style NSS databases. [BZ #18724]
|
|
Copyright (C) 2015-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* This test needs to be statically linked because it access hidden
|
|
functions. */
|
|
|
|
#include <nss.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <support/support.h>
|
|
|
|
static bool errors;
|
|
|
|
static void
|
|
check (const char *what, bool expr)
|
|
{
|
|
if (!expr)
|
|
{
|
|
printf ("FAIL: %s\n", what);
|
|
errors = true;
|
|
}
|
|
}
|
|
|
|
#define CHECK(expr) check (#expr, (expr))
|
|
|
|
static void
|
|
check_rewrite (const char *input, const char *expected)
|
|
{
|
|
char *to_free;
|
|
const char *result = __nss_rewrite_field (input, &to_free);
|
|
CHECK (result != NULL);
|
|
if (result != NULL && strcmp (result, expected) != 0)
|
|
{
|
|
printf ("FAIL: rewrite \"%s\" -> \"%s\", expected \"%s\"\n",
|
|
(input == NULL) ? "(null)" : input, result,
|
|
(expected == NULL) ? "(null)" : expected);
|
|
errors = true;
|
|
}
|
|
free (to_free);
|
|
}
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
CHECK (__nss_valid_field (NULL));
|
|
CHECK (__nss_valid_field (""));
|
|
CHECK (__nss_valid_field ("+"));
|
|
CHECK (__nss_valid_field ("-"));
|
|
CHECK (__nss_valid_field (" "));
|
|
CHECK (__nss_valid_field ("abcdef"));
|
|
CHECK (__nss_valid_field ("abc def"));
|
|
CHECK (__nss_valid_field ("abc\tdef"));
|
|
CHECK (!__nss_valid_field ("abcdef:"));
|
|
CHECK (!__nss_valid_field ("abcde:f"));
|
|
CHECK (!__nss_valid_field (":abcdef"));
|
|
CHECK (!__nss_valid_field ("abcdef\n"));
|
|
CHECK (!__nss_valid_field ("\nabcdef"));
|
|
CHECK (!__nss_valid_field (":"));
|
|
CHECK (!__nss_valid_field ("\n"));
|
|
|
|
CHECK (__nss_valid_list_field (NULL));
|
|
CHECK (__nss_valid_list_field ((char *[]) {(char *) "good", NULL}));
|
|
CHECK (!__nss_valid_list_field ((char *[]) {(char *) "g,ood", NULL}));
|
|
CHECK (!__nss_valid_list_field ((char *[]) {(char *) "g\nood", NULL}));
|
|
CHECK (!__nss_valid_list_field ((char *[]) {(char *) "g:ood", NULL}));
|
|
|
|
check_rewrite (NULL, "");
|
|
check_rewrite ("", "");
|
|
check_rewrite ("abc", "abc");
|
|
check_rewrite ("abc\n", "abc ");
|
|
check_rewrite ("abc:", "abc ");
|
|
check_rewrite ("\nabc", " abc");
|
|
check_rewrite (":abc", " abc");
|
|
check_rewrite (":", " ");
|
|
check_rewrite ("\n", " ");
|
|
check_rewrite ("a:b:c", "a b c");
|
|
check_rewrite ("a\nb\nc", "a b c");
|
|
check_rewrite ("a\nb:c", "a b c");
|
|
check_rewrite ("aa\nbb\ncc", "aa bb cc");
|
|
check_rewrite ("aa\nbb:cc", "aa bb cc");
|
|
|
|
return errors;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|