Skip to content

Fix 11848: Assert failure in getParentValueTypes() #5274

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

Merged
chrchr-github merged 3 commits into from
Aug 2, 2023
Merged

Fix 11848: Assert failure in getParentValueTypes() #5274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8705910
Fix 11848: Assert failure in getParentValueTypes()
pfultz2 Jul 29, 2023
3c04bcf
Format
pfultz2 Jul 29, 2023
4a6a4b8
Merge branch 'main' into assert-type-full-name
pfultz2 Aug 2, 2023
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
28 changes: 20 additions & 8 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3490,16 +3490,28 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
return tok2;
}

const std::string& Type::name() const
std::string Type::name() const
{
const Token* next = classDef->next();
const Token* start = classDef->next();
if (classScope && classScope->enumClass && isEnumType())
return next->strAt(1);
if (next->str() == "class")
return next->strAt(1);
if (next->isName())
return next->str();
return emptyString;
start = start->tokAt(1);
else if (start->str() == "class")
start = start->tokAt(1);
else if (!start->isName())
return emptyString;
const Token* next = start;
while (Token::Match(next, "::|<|>|(|)|[|]|*|&|&&|%name%")) {
if (Token::Match(next, "<|(|[") && next->link())
next = next->link();
next = next->next();
}
std::string result;
for (const Token* tok = start; tok != next; tok = tok->next()) {
if (!result.empty())
result += ' ';
result += tok->str();
}
return result;
}

void SymbolDatabase::debugMessage(const Token *tok, const std::string &type, const std::string &msg) const
Expand Down
2 changes: 1 addition & 1 deletion lib/symboldatabase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class CPPCHECKLIB Type {
}
}

const std::string& name() const;
std::string name() const;

const std::string& type() const {
return classDef ? classDef->str() : emptyString;
Expand Down
8 changes: 8 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6812,6 +6812,14 @@ class TestValueFlow : public TestFixture {
" dummy_resource::log.clear();\n"
"}\n";
valueOfTok(code, "log");

code = "struct D : B<int> {\n"
" D(int i, const std::string& s) : B<int>(i, s) {}\n"
"};\n"
"template<> struct B<int>::S {\n"
" int j;\n"
"};\n";
valueOfTok(code, "B");
}

void valueFlowCrash() {
Expand Down