diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2009-10-26 10:33:32 +0100 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2009-10-26 10:35:10 +0100 |
commit | 3e953b03238ffa15de3c04dec22cb64e1253145b (patch) | |
tree | bb846420fe7b79c2a1b961f191b2fb47853bb59f /src/plugins/cppeditor/cpphoverhandler.cpp | |
parent | dc8318853a4059a4e841e976b137e1d6b963cb4f (diff) | |
download | qt-creator-3e953b03238ffa15de3c04dec22cb64e1253145b.tar.gz |
Check for null scope when hovering.
Fixes a segfault when hovering over QtCleanUpFunction in
qcoreapplication.h.
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/plugins/cppeditor/cpphoverhandler.cpp')
-rw-r--r-- | src/plugins/cppeditor/cpphoverhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index 508eec2854..ff671da25a 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())) |