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

Fix issue 9458: Crash with shadow variables in a lambda (#2406) 

* Fix issue 9458: Crash with shadow variables in a lambda

* Format
This commit is contained in:
Paul Fultz II 2019-11-29 02:45:02 -06:00 committed by orbitcowboy
parent f554a71dea
commit f9d33c07f8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/valueflow.cpp
View File

@ -1665,9 +1665,9 @@ static void valueFlowReverse(TokenList *tokenlist,
const Token * const startToken = var->nameToken(); const Token * const startToken = var->nameToken();
for (Token *tok2 = tok->previous(); ; tok2 = tok2->previous()) { for (Token *tok2 = tok->previous(); ; tok2 = tok2->previous()) {
if (!tok2 || if (!tok2 || tok2 == startToken ||
tok2 == startToken || (tok2->str() == "{" &&
(tok2->str() == "{" && tok2->scope()->type == Scope::ScopeType::eFunction)) { (tok2->scope()->type == Scope::ScopeType::eFunction || tok2->scope()->type == Scope::ScopeType::eLambda))) {
break; break;
} }

8
test/testvalueflow.cpp
View File

@ -4334,6 +4334,14 @@ private:
" state = x;\n" " state = x;\n"
"}\n"; "}\n";
valueOfTok(code, "="); valueOfTok(code, "=");
code = "void a() {\n"
" auto b = [b = 0] {\n"
" if (b) {\n"
" }\n"
" };\n"
"}\n";
valueOfTok(code, "0");
} }
}; };