Fix #9228 (FN common realloc mistake with assignment of NULL)

Do not match for assignments with NULL.
This commit is contained in:
Rikard Falkeborn 2020-07-31 01:44:33 +02:00
parent da8ad9ce19
commit 791051ced0
2 changed files with 31 additions and 1 deletions

View File

@ -547,7 +547,7 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
// Check that another copy of the pointer wasn't saved earlier in the function // Check that another copy of the pointer wasn't saved earlier in the function
if (Token::findmatch(scope->bodyStart, "%name% = %varid% ;", tok, tok->varId()) || if (Token::findmatch(scope->bodyStart, "%name% = %varid% ;", tok, tok->varId()) ||
Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %name% .| %name%| [;=]", tok, tok->varId())) Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %var% .| %var%| [;=]", tok, tok->varId()))
continue; continue;
// Check if the argument is known to be null, which means it is not a memory leak // Check if the argument is known to be null, which means it is not a memory leak

View File

@ -169,6 +169,7 @@ private:
TEST_CASE(realloc21); TEST_CASE(realloc21);
TEST_CASE(realloc22); TEST_CASE(realloc22);
TEST_CASE(realloc23); TEST_CASE(realloc23);
TEST_CASE(realloc24); // #9228
TEST_CASE(reallocarray1); TEST_CASE(reallocarray1);
} }
@ -410,6 +411,35 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void realloc24() { // #9228
check("void f() {\n"
"void *a = NULL;\n"
"a = realloc(a, 20);\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void f() {\n"
"void *a = NULL;\n"
"a = malloc(10);\n"
"a = realloc(a, 20);\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
check("void f() {\n"
"void *a = std::nullptr;\n"
"a = malloc(10);\n"
"a = realloc(a, 20);\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
check("void f(char *b) {\n"
"void *a = NULL;\n"
"a = b;\n"
"a = realloc(a, 20);\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void reallocarray1() { void reallocarray1() {
check("void foo()\n" check("void foo()\n"
"{\n" "{\n"