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

Merge pull request #613 from simartin/ticket_6536 

Ticket #6536: Properly handle variables whose name is that of an allocation function.
This commit is contained in:
PKEuS 2015-06-20 07:38:34 +02:00
parent af4a4663e2 cba0583045
commit 0a49b033ba
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkmemoryleak.cpp
View File

@ -2745,7 +2745,7 @@ void CheckMemoryLeakNoVar::check()
void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope) void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
{ {
for (const Token *tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) { for (const Token *tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
if (Token::Match(tok, "%name% (") && (!tok->next()->astParent() || tok->next()->astParent()->str() == "!" || tok->next()->astParent()->isComparisonOp()) && tok->next()->astOperand1() == tok) { if (!tok->varId() && Token::Match(tok, "%name% (") && (!tok->next()->astParent() || tok->next()->astParent()->str() == "!" || tok->next()->astParent()->isComparisonOp()) && tok->next()->astOperand1() == tok) {
const AllocType allocType = getAllocationType(tok, 0); const AllocType allocType = getAllocationType(tok, 0);
if (allocType != No) if (allocType != No)
returnValueNotUsedError(tok, tok->str()); returnValueNotUsedError(tok, tok->str());

8
test/testmemleak.cpp
View File

@ -6194,6 +6194,7 @@ private:
void run() { void run() {
settings.inconclusive = true; settings.inconclusive = true;
settings.standards.posix = true;
settings.addEnabled("warning"); settings.addEnabled("warning");
LOAD_LIB_2(settings.library, "gtk.cfg"); LOAD_LIB_2(settings.library, "gtk.cfg");
@ -6374,6 +6375,13 @@ private:
" return foo;\n" " return foo;\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// Ticket #6536
check("struct S { S(int) {} };\n"
"void foo(int i) {\n"
" S socket(i);\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void smartPointerFunctionParam() { void smartPointerFunctionParam() {