From b8e7a98ada5abed6a39fc150f4742c0471472895 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 9 Jul 2009 16:20:20 +0200
Subject: [PATCH] Fixed possible crash when completing function-like arguments.
 (cherry picked from commit 85c501c976e330765c392e212cf2775b563ddaea)

---
 src/libs/cplusplus/ResolveExpression.cpp   | 4 ++--
 src/plugins/cpptools/cppcodecompletion.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index d9dcf931af1..79895eb41a0 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -667,7 +667,7 @@ ResolveExpression::resolveMemberExpression(const QList<Result> &baseResults,
             if (NamedType *namedTy = ty->asNamedType())
                 results += resolveMember(p, memberName, namedTy);
             else if (Function *fun = ty->asFunctionType()) {
-                if (fun->scope()->isBlockScope() || fun->scope()->isNamespaceScope()) {
+                if (fun->scope() && (fun->scope()->isBlockScope() || fun->scope()->isNamespaceScope())) {
                     ty = fun->returnType();
 
                     if (ReferenceType *refTy = ty->asReferenceType())
@@ -881,7 +881,7 @@ QList<Symbol *> ResolveClass::resolveClass(NamedType *namedTy,
             if (Function *funTy = decl->type()->asFunctionType()) {
                 // QString foo("ciao");
                 // foo.
-                if (funTy->scope()->isBlockScope() || funTy->scope()->isNamespaceScope()) {
+                if (funTy->scope() && (funTy->scope()->isBlockScope() || funTy->scope()->isNamespaceScope())) {
                     const ResolveExpression::Result r(funTy->returnType(), decl);
                     resolvedSymbols += resolveClass(r, context);
                 }
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index bf8c580d0a3..b0ae27c55ac 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -932,7 +932,7 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
             namedTy = ty->asNamedType();
             if (! namedTy) {
                 Function *fun = ty->asFunctionType();
-                if (fun && (fun->scope()->isBlockScope() || fun->scope()->isNamespaceScope()))
+                if (fun && fun->scope() && (fun->scope()->isBlockScope() || fun->scope()->isNamespaceScope()))
                     namedTy = fun->returnType()->asNamedType();
             }
         }