Bug 736022 - [PATCH] Fix potential null pointer dereference in src/in…

…dex.cpp
doxygen · Sep 23, 2014 · 68c063c · 68c063c
1 parent 79dedb6
commit 68c063c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/dot.cpp b/src/dot.cpp
@@ -1095,7 +1095,7 @@ bool DotFilePatcher::run()
         //   mapId,m_patchFile.data(),map->mapFile.data());
         if (!writeVecGfxFigure(t,map->label,map->mapFile))
         {
-          err("problem writing Gfx %d figure!\n",t);
+          err("problem writing FIG %d figure!\n",mapId);
           return FALSE;
         }
       }

diff --git a/src/index.cpp b/src/index.cpp
@@ -923,9 +923,9 @@ static int countClassesInTreeList(const ClassSDict &cl)
 {
   int count=0;
   ClassSDict::Iterator cli(cl);
-  for (;cli.current(); ++cli)
+  ClassDef *cd;
+  for (;(cd=cli.current());++cli)
   {
-    ClassDef *cd=cli.current();
     if (!hasVisibleRoot(cd->baseClasses())) // filter on root classes
     {
       if (cd->isVisibleInHierarchy()) // should it be visible

diff --git a/src/translator_tw.h b/src/translator_tw.h
@@ -1947,7 +1947,7 @@ class TranslatorChinesetraditional : public Translator
       return result;
     }
     /** UNO IDL service page */
-    virtual QCString trServiceGeneratedFromFiles(bool single)
+    virtual QCString trServiceGeneratedFromFiles(bool)
     {
       // single is true implies a single file
       QCString result=(QCString)"本服務的文件由以下的檔案"
@@ -1956,7 +1956,7 @@ class TranslatorChinesetraditional : public Translator
       return result;
     }
     /** UNO IDL singleton page */
-    virtual QCString trSingletonGeneratedFromFiles(bool single)
+    virtual QCString trSingletonGeneratedFromFiles(bool)
     {
       // single is true implies a single file
       QCString result=(QCString)"本singleton的文件由下面的檔案"