doxygen: fix crash with class inheritance outside of a namespace.

Amazing that I didn't come across this until now.
mosra · May 7, 2018 · 4629958 · 4629958
1 parent 389e5ba
commit 4629958
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 2 deletions.
diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
@@ -2139,7 +2139,7 @@ def parse_xml(state: State, xml: str):
                     class_ = Empty()
                     class_.kind = symbol.kind
                     class_.url = symbol.url
-                    class_.name = symbol.leaf_name if symbol.parent.startswith(state.compounds[compound.id].parent) else symbol.name
+                    class_.name = symbol.leaf_name if state.compounds[compound.id].parent and symbol.parent.startswith(state.compounds[compound.id].parent) else symbol.name
                     class_.brief = symbol.brief
                     class_.templates = symbol.templates
                     class_.is_deprecated = symbol.is_deprecated
@@ -2162,7 +2162,7 @@ def parse_xml(state: State, xml: str):
                     class_ = Empty()
                     class_.kind = symbol.kind
                     class_.url = symbol.url
-                    class_.name = symbol.leaf_name if symbol.parent.startswith(state.compounds[compound.id].parent) else symbol.name
+                    class_.name = symbol.leaf_name if state.compounds[compound.id].parent and symbol.parent.startswith(state.compounds[compound.id].parent) else symbol.name
                     class_.brief = symbol.brief
                     class_.templates = symbol.templates
                     class_.is_deprecated = symbol.is_deprecated

diff --git a/doxygen/test/cpp_derived/classBaseOutsideANamespace.html b/doxygen/test/cpp_derived/classBaseOutsideANamespace.html
diff --git a/doxygen/test/cpp_derived/classDerivedOutsideANamespace.html b/doxygen/test/cpp_derived/classDerivedOutsideANamespace.html
diff --git a/doxygen/test/cpp_derived/input.h b/doxygen/test/cpp_derived/input.h
@@ -41,3 +41,9 @@ namespace Namespace {
 struct UndocumentedDerived: A {};
 
 }
+
+/** @brief A base class outside of a namespace */
+class BaseOutsideANamespace {};
+
+/** @brief A derived class outside of a namespace */
+class DerivedOutsideANamespace: public BaseOutsideANamespace {};
diff --git a/doxygen/test/test_cpp.py b/doxygen/test/test_cpp.py
@@ -59,3 +59,5 @@ def test(self):
         self.assertEqual(*self.actual_expected_contents('classNamespace_1_1PrivateBase.html'))
         self.assertEqual(*self.actual_expected_contents('classAnother_1_1ProtectedBase.html'))
         self.assertEqual(*self.actual_expected_contents('classNamespace_1_1VirtualBase.html'))
+        self.assertEqual(*self.actual_expected_contents('classBaseOutsideANamespace.html'))
+        self.assertEqual(*self.actual_expected_contents('classDerivedOutsideANamespace.html'))