Skip to content

Fix #15034 FN arrayIndexOutOfBounds (ternary in subfunction) #8856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrchr-github wants to merge 5 commits into
base: main
Choose a base branch
from
+24 −19
Open

Fix #15034 FN arrayIndexOutOfBounds (ternary in subfunction) #8856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50b9a36
Update valueflow.cpp
chrchr-github Sep 15, 2026
67eb159
Update vf_settokenvalue.cpp
chrchr-github Sep 15, 2026
86f316f
Update testvalueflow.cpp
chrchr-github Sep 15, 2026
55d8250
Update testvalueflow.cpp
chrchr-github Sep 15, 2026
1406a57
Update testsymboldatabase.cpp
chrchr-github Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5160,9 +5160,10 @@ static void valueFlowInferCondition(TokenList& tokenlist, const Settings& settin
setTokenValue(tok, std::move(value), settings);
}
}
} else if (Token::Match(tok->astParent(), "?|&&|!|%oror%") ||
} else if (Token::Match(tok->astParent(), "&&|!|%oror%") ||
Token::Match(tok->astParent()->previous(), "if|while (") ||
(astIsPointer(tok) && isUsedAsBool(tok, settings))) {
(astIsPointer(tok) && isUsedAsBool(tok, settings)) ||
(astIsLHS(tok) && Token::simpleMatch(tok->astParent(), "?"))) {
std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(), "!=", tok->values(), 0);
if (result.size() != 1)
continue;
Expand Down
16 changes: 0 additions & 16 deletions lib/vf_settokenvalue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,22 +426,6 @@ namespace ValueFlow
setTokenValue(parent, std::move(value), settings);
}
} else if (!value.isImpossible()) {
// is condition only depending on 1 variable?
nonneg int varId = 0;
bool ret = false;
visitAstNodes(parent->astOperand1(),
[&](const Token *t) {
if (t->varId()) {
if (varId > 0 || value.varId != 0)
ret = true;
varId = t->varId();
} else if (t->str() == "(" && Token::Match(t->previous(), "%name%"))
ret = true; // function call
return ret ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
});
if (ret)
return;

value.conditional = true;
value.changeKnownToPossible();

Expand Down
2 changes: 1 addition & 1 deletion test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3631,7 +3631,7 @@ class TestSymbolDatabase : public TestFixture {
ASSERT(fredScope != nullptr);

// The struct Fred has two functions, a constructor and a destructor
ASSERT_EQUALS(2U, fredScope->functionList.size());
ASSERT_EQUALS(2U, fredScope->functionList.size()); // cppcheck-suppress nullPointer // see ticket #9747

// Get linenumbers where the bodies for the constructor and destructor are..
unsigned int constructor = 0;
Expand Down
20 changes: 20 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4286,6 +4286,26 @@ class TestValueFlow : public TestFixture {
"}\n";
auto values = tokenValues(code, "s :", ValueFlow::Value::ValueType::FLOAT);
ASSERT_EQUALS(0, values.size());

code = "int a[5];\n" // 15034
"int g(int i) {\n"
" return a[i < 0 ? -i : i];\n"
"}\n"
"int f() {\n"
" return g(-5);\n"
"}\n";
values = tokenValues(code, "?");
ASSERT_EQUALS(2, values.size());
auto it = values.begin();
ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueType::INT, it->valueType);
ASSERT_EQUALS(0, it->intvalue);
ASSERT_EQUALS_ENUM(ValueFlow::Value::Bound::Lower, it->bound);
ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Possible, it->valueKind);
++it;
ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueType::INT, it->valueType);
ASSERT_EQUALS(5, it->intvalue);
ASSERT_EQUALS_ENUM(ValueFlow::Value::Bound::Point, it->bound);
ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Possible, it->valueKind);
}

void valueFlowForwardLambda() {
Expand Down
Loading