aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-11-19 17:23:53 +0100
committercon <qtc-committer@nokia.com>2009-11-19 18:35:43 +0100
commitc3ea545cf74d75082edb37bc3cedc396113e6669 (patch)
tree34dd2deb887609002abbf1b3e20249ed221b25c3
parentc7ea05fff71e6979f5aaa7430c3cf15b9d7466ed (diff)
Fixed possible crash on constructor completion
When constructor completion was attempted on a base class specified in a class declaration, a null pointer reference would occur. Task-number: QTCREATORBUG-321 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> (cherry picked from commit 69969bef43f8077b7402e46bfc9a1765ad6afd7d)
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 75a36b7cdd..028a0ac8d9 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1060,7 +1060,8 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<TypeOfExpressi
if (doc->parse(Document::ParseDeclaration)) {
doc->check();
if (SimpleDeclarationAST *sd = doc->translationUnit()->ast()->asSimpleDeclaration()) {
- if (sd->declarators->declarator->postfix_declarators
+ if (sd->declarators &&
+ sd->declarators->declarator->postfix_declarators
&& sd->declarators->declarator->postfix_declarators->asFunctionDeclarator()) {
autocompleteSignature = true;
}