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

Fixed #7196 (Improve check: deem sizeof(thing) as using the thing's members)

This commit is contained in:
Daniel Marjamäki 2016-08-02 18:50:04 +02:00
parent cc62259103
commit f23287544a
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkunusedvar.cpp
View File

@ -1270,6 +1270,16 @@ void CheckUnusedVar::checkStructMemberUsage()
if (Token::findmatch(scope->classEnd, castPattern.c_str())) if (Token::findmatch(scope->classEnd, castPattern.c_str()))
continue; continue;
// Bail out if struct is used in sizeof..
for (const Token *tok = scope->classEnd; nullptr != (tok = Token::findsimplematch(tok, "sizeof ("));) {
if (Token::Match(tok->tokAt(2), ("struct| " + scope->className).c_str())) {
bailout = true;
break;
}
}
if (bailout)
continue;
// Try to prevent false positives when struct members are not used directly. // Try to prevent false positives when struct members are not used directly.
if (Token::findmatch(scope->classEnd, (scope->className + " %type%| *").c_str())) if (Token::findmatch(scope->classEnd, (scope->className + " %type%| *").c_str()))
continue; continue;

17
test/testunusedvar.cpp
View File

@ -48,6 +48,7 @@ private:
TEST_CASE(structmember10); TEST_CASE(structmember10);
TEST_CASE(structmember11); // #4168 - initialization with {} / passed by address to unknown function TEST_CASE(structmember11); // #4168 - initialization with {} / passed by address to unknown function
TEST_CASE(structmember12); // #7179 - FP unused structmember TEST_CASE(structmember12); // #7179 - FP unused structmember
TEST_CASE(structmember_sizeof);
TEST_CASE(localvar1); TEST_CASE(localvar1);
TEST_CASE(localvar2); TEST_CASE(localvar2);
@ -461,6 +462,22 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'AB::a' is never used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'AB::a' is never used.\n", errout.str());
} }
void structmember_sizeof() {
checkStructMemberUsage("struct Header {\n"
" uint8_t message_type;\n"
"}\n"
"\n"
"input.skip(sizeof(Header));");
ASSERT_EQUALS("", errout.str());
checkStructMemberUsage("struct Header {\n"
" uint8_t message_type;\n"
"}\n"
"\n"
"input.skip(sizeof(struct Header));");
ASSERT_EQUALS("", errout.str());
}
void functionVariableUsage(const char code[], const char filename[]="test.cpp") { void functionVariableUsage(const char code[], const char filename[]="test.cpp") {
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");