walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #3695 (False positive: memory leak (ptr?free(ptr):0))

This commit is contained in:
Daniel Marjamäki 2012-07-27 12:25:20 +02:00
parent 643f3890b4
commit 0ead18122d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkmemoryleak.cpp
View File

@ -269,7 +269,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
if (tok && tok->str() == "::") if (tok && tok->str() == "::")
tok = tok->next(); tok = tok->next();
if (Token::Match(tok, "free|kfree ( %varid% ) ;", varid) || if (Token::Match(tok, "free|kfree ( %varid% ) [;:]", varid) ||
Token::Match(tok, "free|kfree ( %varid% -", varid) || Token::Match(tok, "free|kfree ( %varid% -", varid) ||
Token::Match(tok, "realloc ( %varid% , 0 ) ;", varid)) Token::Match(tok, "realloc ( %varid% , 0 ) ;", varid))
return Malloc; return Malloc;
@ -989,6 +989,9 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
} }
if (Token::Match(tok->previous(), "[;{})=|] ::| %var%")) { if (Token::Match(tok->previous(), "[;{})=|] ::| %var%")) {
if (Token::Match(tok, "%varid% ?", varid))
tok = tok->tokAt(2);
AllocType dealloc = getDeallocationType(tok, varid); AllocType dealloc = getDeallocationType(tok, varid);
if (dealloc != No && tok->str() == "fcloseall" && alloctype != dealloc) if (dealloc != No && tok->str() == "fcloseall" && alloctype != dealloc)

1
test/testmemleak.cpp
View File

@ -436,6 +436,7 @@ private:
ASSERT_EQUALS(";;dealloc;", getcode("void *p; foo(close(p));", "p")); ASSERT_EQUALS(";;dealloc;", getcode("void *p; foo(close(p));", "p"));
ASSERT_EQUALS(";;;;", getcode("FILE *f1; FILE *f2; fclose(f1);", "f2")); ASSERT_EQUALS(";;;;", getcode("FILE *f1; FILE *f2; fclose(f1);", "f2"));
ASSERT_EQUALS(";;returnuse;", getcode("FILE *f; return fclose(f) == EOF ? 1 : 2;", "f")); ASSERT_EQUALS(";;returnuse;", getcode("FILE *f; return fclose(f) == EOF ? 1 : 2;", "f"));
ASSERT_EQUALS(";;dealloc;", getcode("char *s; s ? free(s) : 0;", "s"));
// if.. // if..
ASSERT_EQUALS(";;if{}", getcode("char *s; if (a) { }", "s")); ASSERT_EQUALS(";;if{}", getcode("char *s; if (a) { }", "s"));