diff options
author | Roberto Raggi <qtc-committer@nokia.com> | 2009-02-10 12:43:25 +0100 |
---|---|---|
committer | Roberto Raggi <qtc-committer@nokia.com> | 2009-02-10 12:43:47 +0100 |
commit | a0909989f7d71ee754cdb61202a519cabff25f7c (patch) | |
tree | 8ef5565005347475a418dd618e094cf5a880d832 /src/plugins/cpptools/cppcodecompletion.cpp | |
parent | ae7c99eb76d95b0bd8b2f473a72e8aef1e597870 (diff) | |
download | qt-creator-a0909989f7d71ee754cdb61202a519cabff25f7c.tar.gz |
Fixes: Possible crash in completeMember.
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index aef68ee6d3..bddcbc0518 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -578,6 +578,8 @@ bool CppCodeCompletion::completeFunction(FullySpecifiedType exprTy, QSet<QString> signatures; foreach (TypeOfExpression::Result p, resolvedTypes) { FullySpecifiedType ty = p.first; + if (! ty) + continue; if (Function *fun = ty->asFunctionType()) { if (TextEditor::CompletionItem item = toCompletionItem(fun)) { QString signature; @@ -600,7 +602,7 @@ bool CppCodeCompletion::completeFunction(FullySpecifiedType exprTy, bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &results, const LookupContext &context) { - if (results.isEmpty()) + if (results.isEmpty() || ! results.first().first) return false; TypeOfExpression::Result result = results.first(); |