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

Fixed crash if double constants are passed as default arguments (#6494)

This commit is contained in:
PKEuS 2015-02-03 22:12:05 +01:00
parent c2b85d1032
commit f1714110d0
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/valueflow.cpp
View File

@ -1646,6 +1646,8 @@ static void valueFlowFunctionDefaultParameter(TokenList *tokenlist, SymbolDataba
const Variable* var = function->getArgumentVar(arg); const Variable* var = function->getArgumentVar(arg);
if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str% [,)]")) { if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str% [,)]")) {
const Token* valueTok = var->nameToken()->tokAt(2); const Token* valueTok = var->nameToken()->tokAt(2);
if (valueTok->values.empty())
continue;
const_cast<Token*>(valueTok)->values.front().defaultArg = true; const_cast<Token*>(valueTok)->values.front().defaultArg = true;
valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, valueTok->values); valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, valueTok->values);
} }

11
test/testvalueflow.cpp
View File

@ -62,6 +62,8 @@ private:
TEST_CASE(valueFlowForLoop); TEST_CASE(valueFlowForLoop);
TEST_CASE(valueFlowSubFunction); TEST_CASE(valueFlowSubFunction);
TEST_CASE(valueFlowFunctionReturn); TEST_CASE(valueFlowFunctionReturn);
TEST_CASE(valueFlowFunctionDefaultParameter);
} }
bool testValueOfX(const char code[], unsigned int linenr, int value) { bool testValueOfX(const char code[], unsigned int linenr, int value) {
@ -1422,6 +1424,15 @@ private:
"}"; "}";
ASSERT_EQUALS(15, valueOfTok(code, "*").intvalue); ASSERT_EQUALS(15, valueOfTok(code, "*").intvalue);
} }
void valueFlowFunctionDefaultParameter() {
const char *code;
code = "class continuous_src_time {\n"
" continuous_src_time(std::complex<double> f, double st = 0.0, double et = infinity) {}\n"
"};";
testValueOfX(code, 2U, 2); // Don't crash (#6494)
}
}; };
REGISTER_TEST(TestValueFlow) REGISTER_TEST(TestValueFlow)