Skip to content
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

Jump to bottom

Fix #12994 FN knownConditionTrueFalse for string size after concatenation #6669

Merged
merged 9 commits into from
Aug 8, 2024
Merged

Fix #12994 FN knownConditionTrueFalse for string size after concatenation #6669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9a2e59
Fix
chrchr-github Aug 7, 2024
2428e76
Merge branch 'main' into chr_12994
chrchr-github Aug 7, 2024
4d30e11
Tests
chrchr-github Aug 7, 2024
c758863
Merge branch 'main' into chr_12994
chrchr-github Aug 7, 2024
1fb009d
Format
chrchr-github Aug 7, 2024
83d1ee1
Fix TODO
chrchr-github Aug 7, 2024
567bef2
Handle unary +
chrchr-github Aug 7, 2024
ba9c157
Simplify
chrchr-github Aug 7, 2024
d39693c
Rename
chrchr-github Aug 7, 2024
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
40 changes: 28 additions & 12 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7094,6 +7094,20 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
}
}

auto forwardMinimumContainerSize = [&](MathLib::bigint size, Token* opTok, const Token* exprTok) -> void {
if (size == 0)
return;

ValueFlow::Value value(size - 1);
value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
value.bound = ValueFlow::Value::Bound::Upper;
value.setImpossible();
Token* next = nextAfterAstRightmostLeaf(opTok);
if (!next)
next = opTok->next();
valueFlowForward(next, exprTok, std::move(value), tokenlist, errorLogger, settings);
};

// after assignment
for (const Scope *functionScope : symboldatabase.functionScopes) {
for (auto* tok = const_cast<Token*>(functionScope->bodyStart); tok != functionScope->bodyEnd; tok = tok->next()) {
Expand Down Expand Up @@ -7161,20 +7175,22 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
value.setImpossible();
valueFlowForward(tok->linkAt(2), containerTok, std::move(value), tokenlist, errorLogger, settings);
}
} else if (Token::simpleMatch(tok, "+=") && astIsContainer(tok->astOperand1())) {

} else if (tok->str() == "+=" && astIsContainer(tok->astOperand1())) {
const Token* containerTok = tok->astOperand1();
const Token* valueTok = tok->astOperand2();
MathLib::bigint size = valueFlowGetStrLength(valueTok);
if (size == 0)
continue;
ValueFlow::Value value(size - 1);
value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
value.bound = ValueFlow::Value::Bound::Upper;
value.setImpossible();
Token* next = nextAfterAstRightmostLeaf(tok);
if (!next)
next = tok->next();
valueFlowForward(next, containerTok, std::move(value), tokenlist, errorLogger, settings);
const MathLib::bigint size = valueFlowGetStrLength(valueTok);
forwardMinimumContainerSize(size, tok, containerTok);

} else if (tok->str() == "=" && Token::simpleMatch(tok->astOperand2(), "+") && astIsContainerString(tok)) {
const Token* tok2 = tok->astOperand2();
MathLib::bigint size = 0;
while (Token::simpleMatch(tok2, "+") && tok2->astOperand2()) {
size += valueFlowGetStrLength(tok2->astOperand2());
tok2 = tok2->astOperand1();
}
size += valueFlowGetStrLength(tok2);
forwardMinimumContainerSize(size, tok, tok->astOperand1());
}
}
}
Expand Down
36 changes: 36 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6949,6 +6949,42 @@ class TestValueFlow : public TestFixture {
" return a[0];\n"
"}\n";
ASSERT(!isKnownContainerSizeValue(tokenValues(code, "a [ 0"), 0).empty());

code = "void f(const std::string& a) {\n" // #12994
" std::string b = a + \"123\";\n"
" if (b.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));

code = "void f(const std::string& a) {\n"
" std::string b = \"123\" + a;\n"
" if (b.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));

code = "void f(const std::string& a, const std::string& b) {\n"
" std::string c = a + b + \"123\";\n"
" if (c.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));

code = "void f(const std::string& a) {\n"
" std::string b = a + \"123\" + \"456\";\n"
" if (b.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));

code = "void f(const std::string& a) {\n"
" std::string b = \"123\" + a + \"456\";\n"
" if (b.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));

code = "void f(const std::string& a, const std::string& b) {\n"
" std::string c = \"123\" + a + b;\n"
" if (c.empty()) {}\n"
"}";
ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));
}

void valueFlowContainerElement()
Expand Down
Loading