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

Fix 10755: Assertion "!maxValue->isKnown()" from valueFlowInferCondition (#3739) 

* Fix 10755: Assertion "!maxValue->isKnown()" from valueFlowInferCondition

* Format
This commit is contained in:
Paul Fultz II 2022-01-22 05:25:20 -06:00 committed by GitHub
parent 8b1ed9cbe1
commit 01e14a12f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/token.cpp
View File

@ -2126,6 +2126,13 @@ bool Token::addValue(const ValueFlow::Value &value)
}); });
} }
// Dont add a value if its already known
if (!value.isKnown() && mImpl->mValues &&
std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [&](const ValueFlow::Value& x) {
return x.isKnown() && sameValueType(x, value) && !x.equalValue(value);
}))
return false;
// assert(value.isKnown() || !mImpl->mValues || std::none_of(mImpl->mValues->begin(), mImpl->mValues->end(), // assert(value.isKnown() || !mImpl->mValues || std::none_of(mImpl->mValues->begin(), mImpl->mValues->end(),
// [&](const ValueFlow::Value& x) { // [&](const ValueFlow::Value& x) {
// return x.isKnown() && sameValueType(x, value); // return x.isKnown() && sameValueType(x, value);

21
test/testvalueflow.cpp
View File

@ -3006,7 +3006,7 @@ private:
" auto x = !i;\n" " auto x = !i;\n"
" return x;\n" " return x;\n"
"}\n"; "}\n";
ASSERT_EQUALS(true, testValueOfXImpossible(code, 4U, 1)); ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 0));
code = "auto f(int i) {\n" code = "auto f(int i) {\n"
" if (i == 1) return;\n" " if (i == 1) return;\n"
@ -3918,7 +3918,8 @@ private:
" }\n" " }\n"
"}\n"; "}\n";
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0)); ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
ASSERT_EQUALS(true, testValueOfX(code, 4U, 9)); // Known to be true, but it could also be 9
ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 1));
code = "void foo() {\n" code = "void foo() {\n"
" for (int x = 0; x < 10; x++) {\n" " for (int x = 0; x < 10; x++) {\n"
@ -3936,7 +3937,8 @@ private:
" }\n" " }\n"
"}\n"; "}\n";
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0)); ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
ASSERT_EQUALS(true, testValueOfX(code, 4U, 9)); // Known to be true, but it could also be 9
ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 1));
// After loop // After loop
code = "void foo() {\n" code = "void foo() {\n"
@ -6211,6 +6213,19 @@ private:
" e.d.b = g - f.c;\n" " e.d.b = g - f.c;\n"
"}\n"; "}\n";
valueOfTok(code, "e"); valueOfTok(code, "e");
code = "struct a {\n"
" std::vector<a> b;\n"
" void c(unsigned d) {\n"
" size_t e = 0;\n"
" size_t f = 0;\n"
" for (auto child : b) {\n"
" f = e;\n"
" e = d - f;\n"
" }\n"
" }\n"
"};\n";
valueOfTok(code, "e");
} }
void valueFlowHang() { void valueFlowHang() {