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

Fixed #2582 (segmentation fault of cppcheck ( if() ))

This commit is contained in:
Daniel Marjamäki 2011-02-18 20:05:44 +01:00
parent 0e34b8bee5
commit 9a760b9654
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checknullpointer.cpp
View File

@ -554,7 +554,7 @@ void CheckNullPointer::nullPointerByCheckAndDeRef()
{ {
// goto the end paranthesis // goto the end paranthesis
const Token *endpar = tok->next()->link(); const Token *endpar = tok->next()->link();
const Token *endbody = endpar ? endpar->next()->link() : 0; const Token *endbody = Token::simpleMatch(endpar, ") {") ? endpar->next()->link() : 0;
if (endbody && if (endbody &&
Token::Match(endbody->tokAt(-3), "[;{}] %var% ;") && Token::Match(endbody->tokAt(-3), "[;{}] %var% ;") &&
isUpper(endbody->tokAt(-2)->str())) isUpper(endbody->tokAt(-2)->str()))

3
test/testnullpointer.cpp
View File

@ -890,6 +890,9 @@ private:
" };\n" " };\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// #2582 - segmentation fault
check("if()");
} }
// Test CheckNullPointer::nullConstantDereference // Test CheckNullPointer::nullConstantDereference