diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-23 19:00:29 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-23 19:00:29 (GMT) |
| commit | 68c063cbffc38c1528dd86232a8b8642fae26b1b (patch) | |
| tree | 88761df613cf2fb63829b8c8cd90a614ed06df58 | |
| parent | 79dedb65ae1f9306b83a69058dbd2015ef7c3b94 (diff) | |
| download | Doxygen-68c063cbffc38c1528dd86232a8b8642fae26b1b.zip Doxygen-68c063cbffc38c1528dd86232a8b8642fae26b1b.tar.gz Doxygen-68c063cbffc38c1528dd86232a8b8642fae26b1b.tar.bz2 | |
Bug 736022 - [PATCH] Fix potential null pointer dereference in src/index.cpp
| -rw-r--r-- | src/dot.cpp | 2 | ||||
| -rw-r--r-- | src/index.cpp | 4 | ||||
| -rw-r--r-- | src/translator_tw.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dot.cpp b/src/dot.cpp index 55e34df..4638309 100644 --- 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 index ff347e3..e3bda27 100644 --- 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 index 8105129..9da3365 100644 --- 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的文件由下面的檔案" |