Fix potential crash when reading tag file which contained nested java classes using generics

Also fixed a parse error when reading a tag file with a Java-style enum

1 files changed, 10 insertions, 3 deletions

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 533e6ef..5492dc9 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1037,9 +1037,16 @@ static Definition *buildScopeFromQualifiedName(const QCString name,
     else // scope is a namespace
     {
     }
-    // make the parent/child scope relation
-    prevScope->addInnerCompound(innerScope);
-    innerScope->setOuterScope(prevScope);
+    if (innerScope)
+    {
+      // make the parent/child scope relation
+      prevScope->addInnerCompound(innerScope);
+      innerScope->setOuterScope(prevScope);
+    }
+    else // current scope is a class, so return only the namespace part...
+    {
+      return prevScope;
+    }
     // proceed to the next scope fragment
     p=idx+l+2;
     prevScope=innerScope;