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

Ticket #5203: Don't crash when checking buffer overrun for invalid code.

This commit is contained in:
Simon Martin 2013-11-30 07:40:32 +01:00
parent 2b7835c5f9
commit fe75686595
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkbufferoverrun.cpp
View File

@ -229,6 +229,8 @@ static bool bailoutIfSwitch(const Token *tok, const unsigned int varid)
const Token* end = tok->linkAt(1)->linkAt(1); const Token* end = tok->linkAt(1)->linkAt(1);
if (Token::simpleMatch(end, "} else {")) // scan the else-block if (Token::simpleMatch(end, "} else {")) // scan the else-block
end = end->linkAt(2); end = end->linkAt(2);
if (Token::simpleMatch(end, "{")) // Ticket #5203: Invalid code, bailout
return true;
for (; tok != end; tok = tok->next()) { for (; tok != end; tok = tok->next()) {
// If scanning a "if" block then bailout for "break" // If scanning a "if" block then bailout for "break"
if (is_if && (tok->str() == "break" || tok->str() == "continue")) if (is_if && (tok->str() == "break" || tok->str() == "continue"))

5
test/testbufferoverrun.cpp
View File

@ -240,6 +240,8 @@ private:
TEST_CASE(crash2); // Ticket #2607 - crash TEST_CASE(crash2); // Ticket #2607 - crash
TEST_CASE(crash3); // Ticket #3034 - crash TEST_CASE(crash3); // Ticket #3034 - crash
TEST_CASE(garbage1); // Ticket #5203
TEST_CASE(executionPaths1); TEST_CASE(executionPaths1);
TEST_CASE(executionPaths2); TEST_CASE(executionPaths2);
TEST_CASE(executionPaths3); // no FP for function parameter TEST_CASE(executionPaths3); // no FP for function parameter
@ -3633,6 +3635,9 @@ private:
"}"); "}");
} }
void garbage1() { // Ticket #5203
check("int f ( int* r ) { { int s[2] ; f ( s ) ; if ( ) } }");
}
void epcheck(const char code[], const char filename[] = "test.cpp") { void epcheck(const char code[], const char filename[] = "test.cpp") {
// Clear the error buffer.. // Clear the error buffer..