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

Revert "Formatted the code [ci skip]" (#3380) 

This reverts commit 7a6d7f7c2d.
This commit is contained in:
Paul Fultz II 2021-08-03 10:53:30 -05:00 committed by GitHub
parent 7a6d7f7c2d
commit 6736ac7e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/valueflow.cpp
View File

@ -2605,13 +2605,13 @@ static Analyzer::Result valueFlowForward(Token* top,
const std::list<ValueFlow::Value>& values, const std::list<ValueFlow::Value>& values,
TokenList* const tokenlist, TokenList* const tokenlist,
const Settings* settings) const Settings* settings)
// *INDENT-ON* { // *INDENT-ON*
Analyzer::Result result{};
for (const ValueFlow::Value& v : values)
{ {
result.update(valueFlowGenericForward(top, makeAnalyzer(exprTok, v, tokenlist), settings)); Analyzer::Result result{};
} for (const ValueFlow::Value& v : values) {
return result; result.update(valueFlowGenericForward(top, makeAnalyzer(exprTok, v, tokenlist), settings));
}
return result;
} }
static void valueFlowReverse(Token* tok, static void valueFlowReverse(Token* tok,
@ -6246,9 +6246,10 @@ static Analyzer::Result valueFlowContainerForwardRecursive(Token* top,
const Token* exprTok, const Token* exprTok,
const ValueFlow::Value& value, const ValueFlow::Value& value,
TokenList* tokenlist) TokenList* tokenlist)
// *INDENT-ON* { // *INDENT-ON*
ContainerExpressionAnalyzer a(exprTok, value, tokenlist); {
return valueFlowGenericForward(top, a, tokenlist->getSettings()); ContainerExpressionAnalyzer a(exprTok, value, tokenlist);
return valueFlowGenericForward(top, a, tokenlist->getSettings());
} }
static Analyzer::Result valueFlowContainerForward(Token* startToken, static Analyzer::Result valueFlowContainerForward(Token* startToken,

2
test/testbufferoverrun.cpp
View File

@ -4322,7 +4322,7 @@ private:
" }\n" " }\n"
" return name;\n" " return name;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void bufferNotZeroTerminated() { void bufferNotZeroTerminated() {