summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-12-26 11:54:56 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-12-26 11:54:56 (GMT)
commited39dab59f8af2c5b42cfac0b3140cf594412121 (patch)
treed378cea4211a02c4aa0efac3fe88c0bfd43bc81c
parentcbd3fa183815191ac5f172a2bac62991642c0b5e (diff)
parent2690774f87b9fcb12b35153de82cde22248b3949 (diff)
downloadDoxygen-ed39dab59f8af2c5b42cfac0b3140cf594412121.zip
Doxygen-ed39dab59f8af2c5b42cfac0b3140cf594412121.tar.gz
Doxygen-ed39dab59f8af2c5b42cfac0b3140cf594412121.tar.bz2
Merge pull request #270 from orbitcowboy/master
Fix potential null pointer dereference in src/context.cpp
-rw-r--r--src/context.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/context.cpp b/src/context.cpp
index ae5d5bc..551db1a 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -5244,7 +5244,7 @@ class NestingNodeContext::Private : public PropertyMapper
void addClasses(bool inherit, bool hideSuper)
{
ClassDef *cd = m_def->definitionType()==Definition::TypeClass ? (ClassDef*)m_def : 0;
- if (inherit)
+ if (cd && inherit)
{
bool hasChildren = !cd->visited && !hideSuper && classHasVisibleChildren(cd);
if (hasChildren)