Fix #12958 Stack overflow with using namespace (danmar#6630)

chrchr-github · web-flow · commit cdb68bd72d2c · 2024-07-22T12:07:28.000+02:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -6129,7 +6129,7 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
     }
 
     for (const auto& u : thisScope.usingList) {
-        if (!u.scope)
+        if (!u.scope || u.scope == &thisScope)
             continue;
         S* nestedScope = const_cast<S*>(u.scope)->findRecordInNestedList(name, false);
         if (nestedScope)
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -422,6 +422,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(symboldatabase103);
         TEST_CASE(symboldatabase104);
         TEST_CASE(symboldatabase105);
+        TEST_CASE(symboldatabase106);
 
         TEST_CASE(createSymbolDatabaseFindAllScopes1);
         TEST_CASE(createSymbolDatabaseFindAllScopes2);
@@ -5580,6 +5581,18 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void symboldatabase106() {
+        {
+            GET_SYMBOL_DB_DBG("namespace N {\n" // #12958 - don't crash
+                              "    namespace O {\n"
+                              "        using namespace N::O;\n"
+                              "    }\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+        }
+    }
+
     void createSymbolDatabaseFindAllScopes1() {
         GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
         ASSERT(db->scopeList.size() == 3);

Original file line number	Diff line number	Diff line change
`@@ -6129,7 +6129,7 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)`
`6129`	`6129`	`}`
`6130`	`6130`
`6131`	`6131`	`for (const auto& u : thisScope.usingList) {`
`6132`		`- if (!u.scope)`
	`6132`	`+ if (!u.scope \|\| u.scope == &thisScope)`
`6133`	`6133`	`continue;`
`6134`	`6134`	`S* nestedScope = const_cast<S*>(u.scope)->findRecordInNestedList(name, false);`
`6135`	`6135`	`if (nestedScope)`