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

sizeof: write inconclusive warning if calculation in sizeof is done indirectly by macro

This commit is contained in:
Daniel Marjamäki 2019-02-26 21:06:44 +01:00
parent b248075aae
commit c44e2ed378
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/checksizeof.cpp
View File

@ -300,8 +300,17 @@ void CheckSizeof::sizeofCalculation()
} }
const Token *argument = tok->next()->astOperand2(); const Token *argument = tok->next()->astOperand2();
if (argument && argument->isCalculation() && (!argument->isExpandedMacro() || printInconclusive)) if (!argument || !argument->isCalculation())
sizeofCalculationError(argument, argument->isExpandedMacro()); continue;
bool inconclusive = false;
if (argument->isExpandedMacro())
inconclusive = true;
else if (tok->next()->isExpandedMacro())
inconclusive = true;
if (!inconclusive || printInconclusive)
sizeofCalculationError(argument, inconclusive);
} }
} }

4
test/testsizeof.cpp
View File

@ -160,6 +160,10 @@ private:
"}"); "}");
ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Found calculation inside sizeof().\n" ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Found calculation inside sizeof().\n"
"[test.cpp:5]: (warning, inconclusive) Found calculation inside sizeof().\n", errout.str()); "[test.cpp:5]: (warning, inconclusive) Found calculation inside sizeof().\n", errout.str());
checkP("#define MACRO(data) f(data, sizeof(data))\n"
"x = MACRO((unsigned int *)data + 4);");
ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found calculation inside sizeof().\n", errout.str());
} }
void sizeofFunction() { void sizeofFunction() {