issue #8704: Doxygen 1.9.1 hangs when msc issue is detected instead of terminating, also CTRL+C does not work

Author: doxygen

src/context.cpp

@@ -11087,7 +11087,7 @@ void generateOutputViaTemplate()
       }
 
       // clear all cached data in Definition objects.
-      for (const auto &kv : Doxygen::symbolMap)
+      for (const auto &kv : *Doxygen::symbolMap)
       {
         kv.second->setCookie(0);
       }

src/definition.cpp

@@ -210,15 +210,15 @@ static void addToMap(const QCString &name,Definition *d)
   if (!vhdlOpt && index!=-1) symbolName=symbolName.mid(index+2);
   if (!symbolName.isEmpty())
   {
-    Doxygen::symbolMap.add(symbolName,d);
+    Doxygen::symbolMap->add(symbolName,d);
 
     d->_setSymbolName(symbolName);
   }
 }
 
 static void removeFromMap(const QCString &name,Definition *d)
 {
-  Doxygen::symbolMap.remove(name,d);
+  Doxygen::symbolMap->remove(name,d);
 }
 
 DefinitionImpl::DefinitionImpl(Definition *def,

src/doxygen.cpp

@@ -150,7 +150,7 @@ bool                  Doxygen::insideMainPage = FALSE; // are we generating docs
 NamespaceDefMutable  *Doxygen::globalScope = 0;
 bool                  Doxygen::parseSourcesNeeded = FALSE;
 SearchIndexIntf      *Doxygen::searchIndex=0;
-SymbolMap<Definition> Doxygen::symbolMap;
+SymbolMap<Definition>*Doxygen::symbolMap;
 ClangUsrMap          *Doxygen::clangUsrMap = 0;
 Cache<std::string,LookupInfo> *Doxygen::lookupCache;
 DirLinkedMap         *Doxygen::dirLinkedMap;
@@ -8166,7 +8166,7 @@ static bool isSymbolHidden(const Definition *d)
 
 static void computeTooltipTexts()
 {
-  for (const auto &kv : Doxygen::symbolMap)
+  for (const auto &kv : *Doxygen::symbolMap)
   {
     DefinitionMutable *dm = toDefinitionMutable(kv.second);
     if (dm && !isSymbolHidden(toDefinition(dm)) && toDefinition(dm)->isLinkableInProject())
@@ -10155,7 +10155,7 @@ static void dumpSymbolMap()
   if (f.is_open())
   {
     TextStream t(&f);
-    for (const auto &kv : Doxygen::symbolMap)
+    for (const auto &kv : *Doxygen::symbolMap)
     {
       dumpSymbol(t,kv.second);
     }
@@ -10285,6 +10285,8 @@ void initDoxygen()
   std::setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8
   std::setlocale(LC_NUMERIC,"C");
 
+  Doxygen::symbolMap = new SymbolMap<Definition>;
+
   Portable::correct_path();
 
   Debug::startTimer();
@@ -10385,6 +10387,7 @@ void cleanUpDoxygen()
   delete Doxygen::groupLinkedMap;
   delete Doxygen::namespaceLinkedMap;
   delete Doxygen::dirLinkedMap;
+  delete Doxygen::symbolMap;
 
   DotManager::deleteInstance();
 }
@@ -10909,6 +10912,7 @@ static void stopDoxygen(int)
     thisDir.remove(Doxygen::filterDBFileName.str());
   }
   killpg(0,SIGINT);
+  cleanUpDoxygen();
   exit(1);
 }
 #endif

src/doxygen.h

@@ -103,7 +103,7 @@ class Doxygen
     static QCString                  htmlFileExtension;
     static bool                      parseSourcesNeeded;
     static SearchIndexIntf          *searchIndex;
-    static SymbolMap<Definition>     symbolMap;
+    static SymbolMap<Definition>    *symbolMap;
     static ClangUsrMap              *clangUsrMap;
     static Cache<std::string,LookupInfo> *lookupCache;
     static DirLinkedMap             *dirLinkedMap;

src/pycode.l

@@ -1513,7 +1513,7 @@ static void findMemberLink(yyscan_t yyscanner,
   //    );
   if (yyextra->currentDefinition)
   {
-    auto range = Doxygen::symbolMap.find(symName);
+    auto range = Doxygen::symbolMap->find(symName);
     for (auto it = range.first; it!=range.second; ++it)
     {
       findMemberLink(yyscanner,ol,it->second,symName);

src/symbolresolver.cpp

@@ -202,12 +202,12 @@ const ClassDef *SymbolResolver::Private::getResolvedClassRec(
   }
 
   //printf("Looking for symbol %s\n",qPrint(name));
-  auto range = Doxygen::symbolMap.find(name);
+  auto range = Doxygen::symbolMap->find(name);
   // the -g (for C# generics) and -p (for ObjC protocols) are now already
   // stripped from the key used in the symbolMap, so that is not needed here.
   if (range.first==range.second)
   {
-    range = Doxygen::symbolMap.find(name+"-p");
+    range = Doxygen::symbolMap->find(name+"-p");
     if (range.first==range.second)
     {
       //fprintf(stderr,"%d ] no such symbol!\n",--level);
@@ -973,7 +973,7 @@ QCString SymbolResolver::Private::substTypedef(
   QCString result=name;
   if (name.isEmpty()) return result;
 
-  auto range = Doxygen::symbolMap.find(name);
+  auto range = Doxygen::symbolMap->find(name);
   if (range.first==range.second)
     return result; // no matches
 

src/util.cpp

@@ -5616,7 +5616,7 @@ static MemberDef *getMemberFromSymbol(const Definition *scope,const FileDef *fil
   if (name.isEmpty())
     return 0; // no name was given
 
-  auto range = Doxygen::symbolMap.find(name);
+  auto range = Doxygen::symbolMap->find(name);
   if (range.first==range.second)
     return 0; // could not find any matching symbols