Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions lib/valueflow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2860,7 +2860,6 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
std::vector<const Token*> args = getArguments(tok);
if (scope->numConstructors == 0) {
auto it = scope->varlist.cbegin();
const bool hasDesignatedInitializers = !args.empty() && isDesignatedInitializer(args[0]->astOperand1());
LifetimeStore::forEach(
tokenlist,
errorLogger,
Expand All @@ -2869,13 +2868,18 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
"Passed to constructor of '" + t->name() + "'.",
ValueFlow::Value::LifetimeKind::SubObject,
[&](LifetimeStore& ls) {
const bool isDesignatedInitializerArg = isDesignatedInitializer(ls.argtok->astOperand1());
// Skip static variable
it = std::find_if(it, scope->varlist.cend(), [&](const Variable &var) {
return !var.isStatic() && (!hasDesignatedInitializers || var.name() == ls.argtok->astOperand1()->astOperand1()->str());
if (var.isStatic())
return false;
if (!isDesignatedInitializerArg)
return true;
return var.name() == ls.argtok->astOperand1()->astOperand1()->str();
});
if (it == scope->varlist.cend())
return;
if (hasDesignatedInitializers)
if (isDesignatedInitializerArg)
ls.argtok = ls.argtok->astOperand2();
const Variable &var = *it;
if (var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
Expand All @@ -2885,7 +2889,7 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
} else if (ValueFlow::isLifetimeBorrowed(ls.argtok, settings)) {
ls.byVal(tok, tokenlist, errorLogger, settings);
}
if (hasDesignatedInitializers)
if (isDesignatedInitializerArg) // TODO: handle mixed initialization?
it = scope->varlist.cbegin();
else
it++;
Expand Down
6 changes: 6 additions & 0 deletions test/testautovariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3985,6 +3985,12 @@ class TestAutoVariables : public TestFixture {
" return a;\n"
"}\n");
ASSERT_EQUALS("", errout_str());

check("struct S { int i; bool b; };\n" // #14260
"void f() {\n"
" struct S s = { .i = 0, true };\n"
"}\n"); // don't crash
ASSERT_EQUALS("", errout_str());
}

void danglingLifetimeInitList() {
Expand Down