QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 22:19:40 +00:00
Code Issues Projects Releases Wiki Activity

fix false positive of check-format.pl regarding '#if' on preceding line; extend negative tests

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11285)
This commit is contained in:
Dr. David von Oheimb 2020-03-10 08:12:57 +01:00
parent aed723f1e4
commit 90a7c90500
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
util/check-format-test-negatives.c
View File

@ -113,7 +113,46 @@ int f(void) /*
5; 5;
else else
6; 6;
if (1) {
if (2) {
case MAC_TYPE_MAC:
{
EVP_MAC_CTX *new_mac_ctx;
if (ctx->pkey == NULL)
return 0;
}
break;
default:
/* This should be dead code */
return 0;
}
}
if (expr_line1
== expr_line2
&& expr_line3) {
c1;
} else {
c;
d;
}
if (expr_line1
== expr_line2
&& expr_line3)
hanging_stmt;
} }
const OPTIONS passwd_options[] = {
{"aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm"},
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
{"crypt", OPT_CRYPT, '-', "Standard Unix password algorithm (default)"},
#endif
OPT_R_OPTIONS,
{NULL}
};
typedef * d(int) typedef * d(int)
x; x;
typedef (int) typedef (int)

2
util/check-format.pl
View File

@ -1001,7 +1001,7 @@ while (<>) { # loop over all lines of all input files
# check for opening brace after if/while/for/switch/do not on same line # check for opening brace after if/while/for/switch/do not on same line
# note that "no '{' on same line after '} else'" is handled further below # note that "no '{' on same line after '} else'" is handled further below
if (/^[\s@]*{/ && # leading '{' if (/^[\s@]*{/ && # leading '{'
$line_before > 0 && $line_before > 0 && !($contents_before_ =~ m/^\s*#/) && # not preprocessor directive '#if
(my ($head, $mid, $tail) = ($contents_before_ =~ m/(^|^.*\W)(if|while|for|switch|do)(\W.*$|$)/))) { (my ($head, $mid, $tail) = ($contents_before_ =~ m/(^|^.*\W)(if|while|for|switch|do)(\W.*$|$)/))) {
my $brace_after = $tail =~ /^[\s@]*{/; # any whitespace or comments then '{' my $brace_after = $tail =~ /^[\s@]*{/; # any whitespace or comments then '{'
report("'{' not on same line as preceding '$mid'") if !$brace_after; report("'{' not on same line as preceding '$mid'") if !$brace_after;