checksrc: detect curlx_safefree() opportunities

Follow-up to bcd0497c81 #21700
Follow-up to 1c3289c85e #21684
Follow-up to c0f0e400e0 #5968
Follow-up to 0f4a03cbb6

Closes #21703
This commit is contained in:
Viktor Szakats 2026-05-21 00:51:04 +02:00
parent f2692b54f7
commit 419b1c0b75
No known key found for this signature in database
3 changed files with 33 additions and 1 deletions

View file

@ -129,6 +129,10 @@ warnings are:
- `UNUSEDIGNORE`: a `checksrc` inlined warning ignore was asked for but not
used, that is an ignore that should be removed or changed to get used.
- `USESAFEFREE`: there was a `curlx_free(var)` call made right before assigning
NULL to `var`. We prefer replacing that with `curlx_safefree()`, which is
doing these two operations in a single call.
### Extended warnings
Some warnings are computationally expensive to perform, so they are turned off

View file

@ -201,6 +201,7 @@ my %warnings = (
'TRAILINGSPACE' => 'Trailing whitespace on the line',
'TYPEDEFSTRUCT' => 'typedefed struct',
'UNUSEDIGNORE' => 'a warning ignore was not used',
'USESAFEFREE' => 'replace curlx_free() + NULL assignment with curlx_safefree()',
);
sub readskiplist {
@ -532,6 +533,8 @@ sub scanfile {
my $l = "";
my $prep = 0;
my $prevp = 0;
my $prevfreeindent = "";
my $prevfreevar = "";
if($verbose) {
printf "Checking file: $file\n";
@ -973,6 +976,24 @@ sub scanfile {
$line, length($1), $file, $ol, "no space before label");
}
if($prevfreevar ne "") {
if(rindex($l, "$prevfreeindent$prevfreevar = NULL;", 0) == 0) {
checkwarn("USESAFEFREE",
$line, length($prevfreeindent), $file, $ol,
"replace curlx_free() + NULL assignment with curlx_safefree()");
}
}
if($l) {
if($l =~ /^( *)curlx_free\(([^)]+)\);/) {
$prevfreeindent = $1;
$prevfreevar = $2;
}
else {
$prevfreeindent = "";
$prevfreevar = "";
}
}
# scan for use of banned functions
my $bl = $l;
again:

View file

@ -91,6 +91,10 @@ void startfunc(int a, int b) {
int d = impl->magicbad(1); /* member function always allowed */
int e = impl.magicbad(); /* member function always allowed */
curlx_free(ptr); /* two line
comment */
ptr = NULL; /* comment more */
/* comment does not end
</file>
@ -227,13 +231,16 @@ void startfunc(int a, int b) {
./%LOGDIR/code1185.c:71:2: warning: // comment (CPPCOMMENTS)
// CPP comment ?
^
./%LOGDIR/code1185.c:78:2: warning: replace curlx_free() + NULL assignment with curlx_safefree() (USESAFEFREE)
ptr = NULL; /* more comment */
^
./%LOGDIR/code1185.c:1:1: error: Missing copyright statement (COPYRIGHT)
%SP
^
./%LOGDIR/code1185.c:1:1: error: Missing closing comment (OPENCOMMENT)
%SP
^
checksrc: 3 errors and 42 warnings
checksrc: 3 errors and 43 warnings
</stdout>
<errorcode>
5