From 3e953b03238ffa15de3c04dec22cb64e1253145b Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 26 Oct 2009 10:33:32 +0100
Subject: [PATCH] Check for null scope when hovering.

Fixes a segfault when hovering over QtCleanUpFunction in
qcoreapplication.h.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
---
 src/plugins/cppeditor/cpphoverhandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 508eec2854c..ff671da25af 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -337,7 +337,8 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
             firstType = resolve(firstType, typeOfExpression.lookupContext(),
                                 &resolvedSymbol, &resolvedName);
 
-            if (resolvedSymbol && resolvedSymbol->scope()->isClassScope()) {
+            if (resolvedSymbol && resolvedSymbol->scope()
+                && resolvedSymbol->scope()->isClassScope()) {
                 Class *enclosingClass = resolvedSymbol->scope()->owner()->asClass();
                 if (Identifier *id = enclosingClass->identifier()) {
                     if (id->isEqualTo(resolvedSymbol->identifier()))