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

Fix #10828 Internal error. Token::Match called with varid 0 (#3859) 

* Fix #10828 Internal error. Token::Match called with varid 0

* Fix test
This commit is contained in:
chrchr-github 2022-02-26 23:48:29 +01:00 committed by GitHub
parent 441b437cea
commit d79d6e60db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/valueflow.cpp
View File

@ -6083,7 +6083,8 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings)))) getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings))))
break; break;
else if (Token::simpleMatch(tok2, ") {") && Token::findmatch(tok2->link(), "%varid%", tok2, vartok->varId())) { else if (Token::simpleMatch(tok2, ") {")) {
if (vartok->varId() && Token::findmatch(tok2->link(), "%varid%", tok2, vartok->varId())) {
if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(1), vartok->varId())) { if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(1), vartok->varId())) {
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return"); bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
@ -6098,12 +6099,10 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return"); bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
break; break;
} }
tok2 = tok2->linkAt(2); tok2 = tok2->linkAt(2);
} }
} }
else {
else if (Token::simpleMatch(tok2, ") {")) {
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "For loop skipping {} code"); bailout(tokenlist, errorLogger, tok2, "For loop skipping {} code");
tok2 = tok2->linkAt(1); tok2 = tok2->linkAt(1);
@ -6111,6 +6110,7 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
tok2 = tok2->linkAt(2); tok2 = tok2->linkAt(2);
} }
} }
}
} }
static void valueFlowForLoopSimplifyAfter(Token* fortok, static void valueFlowForLoopSimplifyAfter(Token* fortok,

13
test/testvalueflow.cpp
View File

@ -4171,6 +4171,19 @@ private:
" }\n" " }\n"
"}\n"; "}\n";
testValueOfX(code, 0, 0); // <- don't throw testValueOfX(code, 0, 0); // <- don't throw
code = "struct C {\n" // #10828
" int& v() { return i; }\n"
" int& w() { return j; }\n"
" int i{}, j{};\n"
"};\n"
"void f() {\n"
" C c;\n"
" for (c.w() = 0; c.w() < 2; c.w()++) {\n"
" for (c.v() = 0; c.v() < 24; c.v()++) {}\n"
" }\n"
"}\n";
testValueOfX(code, 0, 0); // <- don't throw
} }
void valueFlowSubFunction() { void valueFlowSubFunction() {