summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/cppcodeparser.cpp
diff options
context:
space:
mode:
authorMontel Laurent <laurent.montel@kdab.com>2013-03-19 10:58:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-02 01:40:04 +0200
commit4a5182e63de0266a52b219cbd72c5edc839453e0 (patch)
treeb0f412497d3008c4d5194160b05165a7eccb8a7e /src/tools/qdoc/cppcodeparser.cpp
parenteb42513a50091f2cf5f7274a41038ec7e613c50d (diff)
Check 'node' for NULL before derefencing it, not after
Change-Id: Iab4b28997d9d13645375284083e4e603e02cec5c Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/cppcodeparser.cpp')
-rw-r--r--src/tools/qdoc/cppcodeparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 68edb1336a..db7c637b53 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -867,8 +867,8 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
}
}
else if (command == COMMAND_REIMP) {
- if (node->parent() && !node->parent()->isInternal()) {
- if (node != 0 && node->type() == Node::Function) {
+ if (node != 0 && node->parent() && !node->parent()->isInternal()) {
+ if (node->type() == Node::Function) {
FunctionNode *func = (FunctionNode *) node;
const FunctionNode *from = func->reimplementedFrom();
if (from == 0) {