Fix #12958 reopened Stack overflow with using namespace (danmar#6639)

chrchr-github · web-flow · commit fc6de74ea7a3 · 2024-07-24T15:58:44.000+02:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -6123,7 +6123,7 @@ const Scope *SymbolDatabase::findScopeByName(const std::string& name) const
 //---------------------------------------------------------------------------
 
 template<class S, class T, REQUIRES("S must be a Scope class", std::is_convertible<S*, const Scope*> ), REQUIRES("T must be a Type class", std::is_convertible<T*, const Type*> )>
-S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
+S* findRecordInNestedListImpl(S& thisScope, const std::string& name, bool isC, std::set<const Scope*>& visited)
 {
     for (S* scope: thisScope.nestedList) {
         if (scope->className == name && scope->type != Scope::eFunction)
@@ -6136,9 +6136,10 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
     }
 
     for (const auto& u : thisScope.usingList) {
-        if (!u.scope || u.scope == &thisScope)
+        if (!u.scope || u.scope == &thisScope || visited.find(u.scope) != visited.end())
             continue;
-        S* nestedScope = const_cast<S*>(u.scope)->findRecordInNestedList(name, false);
+        visited.emplace(u.scope);
+        S* nestedScope = findRecordInNestedListImpl<S, T>(const_cast<S&>(*u.scope), name, false, visited);
         if (nestedScope)
             return nestedScope;
     }
@@ -6158,12 +6159,14 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
 
 const Scope* Scope::findRecordInNestedList(const std::string & name, bool isC) const
 {
-    return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC);
+    std::set<const Scope*> visited;
+    return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC, visited);
 }
 
 Scope* Scope::findRecordInNestedList(const std::string & name, bool isC)
 {
-    return findRecordInNestedListImpl<Scope, Type>(*this, name, isC);
+    std::set<const Scope*> visited;
+    return findRecordInNestedListImpl<Scope, Type>(*this, name, isC, visited);
 }
 
 //---------------------------------------------------------------------------
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -5609,6 +5609,20 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(db != nullptr);
             ASSERT_EQUALS("", errout_str());
         }
+        {
+            GET_SYMBOL_DB_DBG("namespace N {\n"
+                              "    struct S {};\n"
+                              "}\n"
+                              "namespace O {\n"
+                              "    using namespace N;\n"
+                              "}\n"
+                              "namespace N {\n"
+                              "    using namespace O;\n"
+                              "    struct T {};\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+        }
     }
 
     void createSymbolDatabaseFindAllScopes1() {

Original file line number	Diff line number	Diff line change
`@@ -6123,7 +6123,7 @@ const Scope *SymbolDatabase::findScopeByName(const std::string& name) const`
`6123`	`6123`	`//---------------------------------------------------------------------------`
`6124`	`6124`
`6125`	`6125`	`template<class S, class T, REQUIRES("S must be a Scope class", std::is_convertible<S, const Scope> ), REQUIRES("T must be a Type class", std::is_convertible<T, const Type> )>`
`6126`		`-S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)`
	`6126`	`+S* findRecordInNestedListImpl(S& thisScope, const std::string& name, bool isC, std::set<const Scope*>& visited)`
`6127`	`6127`	`{`
`6128`	`6128`	`for (S* scope: thisScope.nestedList) {`
`6129`	`6129`	`if (scope->className == name && scope->type != Scope::eFunction)`
`@@ -6136,9 +6136,10 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)`
`6136`	`6136`	`}`
`6137`	`6137`
`6138`	`6138`	`for (const auto& u : thisScope.usingList) {`
`6139`		`- if (!u.scope \|\| u.scope == &thisScope)`
	`6139`	`+ if (!u.scope \|\| u.scope == &thisScope \|\| visited.find(u.scope) != visited.end())`
`6140`	`6140`	`continue;`
`6141`		`- S* nestedScope = const_cast<S*>(u.scope)->findRecordInNestedList(name, false);`
	`6141`	`+ visited.emplace(u.scope);`
	`6142`	`+ S* nestedScope = findRecordInNestedListImpl<S, T>(const_cast<S&>(*u.scope), name, false, visited);`
`6142`	`6143`	`if (nestedScope)`
`6143`	`6144`	`return nestedScope;`
`6144`	`6145`	`}`
`@@ -6158,12 +6159,14 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)`
`6158`	`6159`
`6159`	`6160`	`const Scope* Scope::findRecordInNestedList(const std::string & name, bool isC) const`
`6160`	`6161`	`{`
`6161`		`- return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC);`
	`6162`	`+ std::set<const Scope*> visited;`
	`6163`	`+ return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC, visited);`
`6162`	`6164`	`}`
`6163`	`6165`
`6164`	`6166`	`Scope* Scope::findRecordInNestedList(const std::string & name, bool isC)`
`6165`	`6167`	`{`
`6166`		`- return findRecordInNestedListImpl<Scope, Type>(*this, name, isC);`
	`6168`	`+ std::set<const Scope*> visited;`
	`6169`	`+ return findRecordInNestedListImpl<Scope, Type>(*this, name, isC, visited);`
`6167`	`6170`	`}`
`6168`	`6171`
`6169`	`6172`	`//---------------------------------------------------------------------------`