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

Merge pull request #408 from Dmitry-Me/continueEarlyToOmitUnneededActions2 

Continue early to omit unneeded operations
This commit is contained in:
amai2012 2014-08-27 16:36:19 +02:00
parent cd33d784d5 44ba0ca347
commit c242faf45e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkstl.cpp
View File

@ -550,11 +550,12 @@ void CheckStl::pushback()
if (Token::Match(tok, "%var% = & %var% [")) { if (Token::Match(tok, "%var% = & %var% [")) {
// Variable id for pointer // Variable id for pointer
const unsigned int pointerId(tok->varId()); const unsigned int pointerId(tok->varId());
if( pointerId == 0 )
continue;
// Variable id for the container variable // Variable id for the container variable
const unsigned int containerId(tok->tokAt(3)->varId()); const unsigned int containerId(tok->tokAt(3)->varId());
if (containerId == 0)
if (pointerId == 0 || containerId == 0)
continue; continue;
bool invalidPointer = false; bool invalidPointer = false;