Various fixes based on coverity scan results

1 files changed, 23 insertions, 20 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index 6ddc3f9..88bc44c 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -3969,28 +3969,31 @@ ClassDef *ClassDefImpl::insertTemplateInstance(const QCString &fileName,
           Doxygen::classLinkedMap->add(tcname,
             std::unique_ptr<ClassDef>(
               new ClassDefImpl(fileName,startLine,startColumn,tcname,ClassDef::Class))));
-    templateClass->setTemplateMaster(this);
-    templateClass->setOuterScope(getOuterScope());
-    templateClass->setHidden(isHidden());
-    templateClass->setArtificial(isArtificial());
-    m_impl->templateInstances->insert(templSpec,templateClass);
-
-    // also add nested classes
-    for (const auto &innerCd : m_impl->innerClasses)
+    if (templateClass)
     {
-      QCString innerName = tcname+"::"+innerCd->localName();
-      ClassDefMutable *innerClass =
-        toClassDefMutable(
-            Doxygen::classLinkedMap->add(innerName,
-              std::unique_ptr<ClassDef>(
-                new ClassDefImpl(fileName,startLine,startColumn,innerName,ClassDef::Class))));
-      if (innerClass)
+      templateClass->setTemplateMaster(this);
+      templateClass->setOuterScope(getOuterScope());
+      templateClass->setHidden(isHidden());
+      templateClass->setArtificial(isArtificial());
+      m_impl->templateInstances->insert(templSpec,templateClass);
+
+      // also add nested classes
+      for (const auto &innerCd : m_impl->innerClasses)
       {
-        templateClass->addInnerCompound(innerClass);
-        innerClass->setOuterScope(templateClass);
-        innerClass->setHidden(isHidden());
-        innerClass->setArtificial(TRUE);
-        freshInstance=TRUE;
+        QCString innerName = tcname+"::"+innerCd->localName();
+        ClassDefMutable *innerClass =
+          toClassDefMutable(
+              Doxygen::classLinkedMap->add(innerName,
+                std::unique_ptr<ClassDef>(
+                  new ClassDefImpl(fileName,startLine,startColumn,innerName,ClassDef::Class))));
+        if (innerClass)
+        {
+          templateClass->addInnerCompound(innerClass);
+          innerClass->setOuterScope(templateClass);
+          innerClass->setHidden(isHidden());
+          innerClass->setArtificial(TRUE);
+          freshInstance=TRUE;
+        }
       }
     }
   }