Skip to content

Commit

Permalink
Fix crash in SymbolDatabase::addClassFunction() (f'up to #12209) (#5689)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrchr-github authored Nov 21, 2023
1 parent 2b61c9e commit 8b6cbe2
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 22 deletions.
2 changes: 1 addition & 1 deletion lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,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
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

0 comments on commit 8b6cbe2

Please sign in to comment.