Skip to content

Fix FPs memleak with array and ptr to ptr #4139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orbitcowboy merged 9 commits into from
May 26, 2022
Merged

Fix FPs memleak with array and ptr to ptr #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4bf857
Fix #11019 FN memleak with redundant pointer op
chrchr-github May 23, 2022
795ec2e
Style
chrchr-github May 23, 2022
f468ea1
Fix #7705 FN: Memory leak not detected on struct member
chrchr-github May 23, 2022
1df7f28
Merge branch 'main' into chr_Fix11019
chrchr-github May 24, 2022
6e8243f
Fix FP memleak with function call, fix cppcheckError
chrchr-github May 24, 2022
740d9f5
Fix FP memleak with array
chrchr-github May 25, 2022
f72b916
Merge
chrchr-github May 25, 2022
9f8c619
Fix FPs memleak with array and ptr to ptr
chrchr-github May 26, 2022
afabd36
Merge
chrchr-github May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/checkmemoryleak.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,9 @@ void CheckMemoryLeakStructMember::check()

const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
for (const Variable* var : symbolDatabase->variableList()) {
if (!var || (!var->isLocal() && !(var->isArgument() && var->scope())) || var->isStatic() || var->isReference())
if (!var || (!var->isLocal() && !(var->isArgument() && var->scope())) || var->isStatic())
continue;
if (var->isReference() || (var->valueType() && var->valueType()->pointer > 1))
continue;
if (var->typeEndToken()->isStandardType())
continue;
Expand All @@ -752,7 +754,7 @@ bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable)
void CheckMemoryLeakStructMember::checkStructVariable(const Variable * const variable)
{
// Is struct variable a pointer?
if (variable->isPointer()) {
if (variable->isArrayOrPointer()) {
// Check that variable is allocated with malloc
if (!isMalloc(variable))
return;
Expand Down
16 changes: 16 additions & 0 deletions test/testmemleak.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1930,6 +1930,22 @@ class TestMemleakStructMember : public TestFixture {
" s->a[e] = strdup(n);\n"
"}\n", false);
ASSERT_EQUALS("", errout.str());

check("void f(struct S** s, const char* c) {\n"
" *s = malloc(sizeof(struct S));\n"
" (*s)->value = strdup(c);\n"
"}\n", false);
ASSERT_EQUALS("", errout.str());

check("struct S {\n"
" size_t mpsz;\n"
" void* hdr;\n"
"};\n"
"void f(struct S s[static 1U], int fd, size_t size) {\n"
" s->mpsz = size;\n"
" s->hdr = mmap(NULL, s->mpsz, PROT_READ, MAP_SHARED, fd, 0);\n"
"}\n", false);
ASSERT_EQUALS("", errout.str());
}

void failedAllocation() {
Expand Down