OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-format: -Wformat-diag fix [PR93641]

Browse Source 
The last argument to strncasecmp is incorrect, so it matched even when
can%' wasn't followed by t.  Also, the !ISALPHA (format_chars[1]) test
looks pointless, format_chars[1] must be ' if strncasecmp succeeded and
so will never be ISALPHA.

2020-02-10  Jakub Jelinek  <jakub@redhat.com>

	PR other/93641
	* c-format.c (check_plain): Fix up last argument of strncasecmp.
	Remove useless extra test.

	* gcc.dg/format/gcc_diag-11.c (test_cdiag_bad_words): Add two further
	tests.
This commit is contained in:
Jakub Jelinek 2020-02-10 15:50:17 +01:00
parent 5602b48b2e
commit a59aa30268
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/c-family/ChangeLog
View File

@ -1,3 +1,9 @@
2020-02-10 Jakub Jelinek <jakub@redhat.com>
PR other/93641
* c-format.c (check_plain): Fix up last argument of strncasecmp.
Remove useless extra test.
2020-02-03 Julian Brown <julian@codesourcery.com>
Tobias Burnus <tobias@codesourcery.com>

3
gcc/c-family/c-format.c
View File

@ -3270,8 +3270,7 @@ check_plain (location_t format_string_loc, tree format_string_cst,
"quoted %qs directive in format; "
"use %qs instead", "%s", "%qs");
else if (format_chars - orig_format_chars > 2
&& !strncasecmp (format_chars - 3, "can%'t", 5)
&& !ISALPHA (format_chars[1]))
&& !strncasecmp (format_chars - 3, "can%'t", 6))
format_warning_substr (format_string_loc,
format_string_cst,
fmtchrpos - 3, fmtchrpos + 3, opt,

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-02-10 Jakub Jelinek <jakub@redhat.com>
PR other/93641
* gcc.dg/format/gcc_diag-11.c (test_cdiag_bad_words): Add two further
tests.
2020-02-10 Feng Xue <fxue@os.amperecomputing.com>
PR ipa/93203

2
gcc/testsuite/gcc.dg/format/gcc_diag-11.c
View File

@ -400,6 +400,8 @@ void test_cdiag_bad_words (tree t, gimple *gc)
cdiag ("you can't do that"); /* { dg-warning "contraction 'can't' in format" } */
cdiag ("you can%'t do that");/* { dg-warning "contraction 'can%'t' in format" } */
cdiag ("Can%'t touch this.");/* { dg-warning "contraction 'Can%'t' in format" } */
cdiag ("can%'");
cdiag ("can%' whatever");
cdiag ("on the commandline");/* { dg-warning "misspelled term 'commandline' in format; use 'command line' instead" } */
cdiag ("command line option");/* { dg-warning "misspelled term 'command line option' in format; use 'command-line option' instead" } */
cdiag ("it mustn't be"); /* { dg-warning "contraction 'mustn't' in format" } */