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

Fixed crash on garbage code introduced recently, optimized code in valueFlowFunctionReturn.

This commit is contained in:
PKEuS 2015-02-01 12:26:46 +01:00
parent a4cc4c3e3f
commit 58c3fdd063
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/valueflow.cpp
View File

@ -1531,6 +1531,10 @@ static void valueFlowForLoop(TokenList *tokenlist, SymbolDatabase* symboldatabas
Token* tok = const_cast<Token*>(scope->classDef); Token* tok = const_cast<Token*>(scope->classDef);
Token* const bodyStart = const_cast<Token*>(scope->classStart); Token* const bodyStart = const_cast<Token*>(scope->classStart);
if (!Token::simpleMatch(tok->next()->astOperand2(), ";") ||
!Token::simpleMatch(tok->next()->astOperand2()->astOperand2(), ";"))
continue;
unsigned int varid(0); unsigned int varid(0);
MathLib::bigint num1(0), num2(0), numAfter(0); MathLib::bigint num1(0), num2(0), numAfter(0);
@ -1632,6 +1636,15 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
if (tok->str() != "(" || !tok->astOperand1() || !tok->astOperand1()->function()) if (tok->str() != "(" || !tok->astOperand1() || !tok->astOperand1()->function())
continue; continue;
// Get scope and args of function
const Function * const function = tok->astOperand1()->function();
const Scope * const functionScope = function->functionScope;
if (!functionScope || !Token::simpleMatch(functionScope->classStart, "{ return")) {
if (functionScope && settings->debugwarnings)
bailout(tokenlist, errorLogger, tok, "function return; nontrivial function body");
continue;
}
// Arguments.. // Arguments..
std::vector<MathLib::bigint> parvalues; std::vector<MathLib::bigint> parvalues;
{ {
@ -1650,15 +1663,6 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
continue; continue;
} }
// Get scope and args of function
const Function * const function = tok->astOperand1()->function();
const Scope * const functionScope = function ? function->functionScope : nullptr;
if (!functionScope || !Token::simpleMatch(functionScope->classStart, "{ return")) {
if (functionScope && settings->debugwarnings)
bailout(tokenlist, errorLogger, tok, "function return; nontrivial function body");
continue;
}
std::map<unsigned int, MathLib::bigint> programMemory; std::map<unsigned int, MathLib::bigint> programMemory;
for (std::size_t i = 0; i < parvalues.size(); ++i) { for (std::size_t i = 0; i < parvalues.size(); ++i) {
const Variable * const arg = function->getArgumentVar(i); const Variable * const arg = function->getArgumentVar(i);

3
test/testgarbage.cpp
View File

@ -400,6 +400,9 @@ private:
// 6122 survive garbage code // 6122 survive garbage code
code = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }"; code = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }";
checkCode(code); checkCode(code);
code = "void f1() { for (int n = 0 n < 10 n++); }";
checkCode(code);
} }
void garbageSymbolDatabase() { void garbageSymbolDatabase() {