Skip to content

Fix crash in SymbolDatabase::addClassFunction() (f'up to #12209) #5689

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 1 commit into from
Nov 21, 2023
Merged

Fix crash in SymbolDatabase::addClassFunction() (f'up to #12209) #5689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3287,7 +3287,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
tok1 = tok1->tokAt(2);
scope2 = scope2->findRecordInNestedList(tok1->str());
}
if (isAnonymousNamespace)
if (scope2 && isAnonymousNamespace)
scope2 = scope2->findRecordInNestedList(tok1->str());

if (count == 1 && scope2) {
Expand Down
62 changes: 41 additions & 21 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5464,27 +5464,47 @@ class TestSymbolDatabase : public TestFixture {

void createSymbolDatabaseFindAllScopes7()
{
GET_SYMBOL_DB("namespace {\n"
" struct S {\n"
" void f();\n"
" };\n"
"}\n"
"void S::f() {}\n");
ASSERT(db);
ASSERT_EQUALS(4, db->scopeList.size());
auto anon = db->scopeList.begin();
++anon;
ASSERT(anon->className.empty());
ASSERT_EQUALS(anon->type, Scope::eNamespace);
auto S = anon;
++S;
ASSERT_EQUALS(S->type, Scope::eStruct);
ASSERT_EQUALS(S->className, "S");
ASSERT_EQUALS(S->nestedIn, &*anon);
const Token* f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
ASSERT(f && f->function() && f->function()->functionScope && f->function()->functionScope->bodyStart);
ASSERT_EQUALS(f->function()->functionScope->functionOf, &*S);
ASSERT_EQUALS(f->function()->functionScope->bodyStart->linenr(), 6);
{
GET_SYMBOL_DB("namespace {\n"
" struct S {\n"
" void f();\n"
" };\n"
"}\n"
"void S::f() {}\n");
ASSERT(db);
ASSERT_EQUALS(4, db->scopeList.size());
auto anon = db->scopeList.begin();
++anon;
ASSERT(anon->className.empty());
ASSERT_EQUALS(anon->type, Scope::eNamespace);
auto S = anon;
++S;
ASSERT_EQUALS(S->type, Scope::eStruct);
ASSERT_EQUALS(S->className, "S");
ASSERT_EQUALS(S->nestedIn, &*anon);
const Token* f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
ASSERT(f && f->function() && f->function()->functionScope && f->function()->functionScope->bodyStart);
ASSERT_EQUALS(f->function()->functionScope->functionOf, &*S);
ASSERT_EQUALS(f->function()->functionScope->bodyStart->linenr(), 6);
}
{
GET_SYMBOL_DB("namespace {\n"
" int i = 0;\n"
"}\n"
"namespace N {\n"
" namespace {\n"
" template<typename T>\n"
" struct S {\n"
" void f();\n"
" };\n"
" template<typename T>\n"
" void S<T>::f() {}\n"
" }\n"
" S<int> g() { return {}; }\n"
"}\n");
ASSERT(db); // don't crash
ASSERT_EQUALS("", errout.str());
}
}

void createSymbolDatabaseIncompleteVars()
Expand Down