From 364c95476e3a74898bf4d0884670765bb7b9f592 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 2 May 2013 11:28:12 +0200 Subject: [PATCH] C++: fix possible null-pointer derefs. Change-Id: Ie6a2398f3a9e5c26a9af1578e512da53a01d15f5 Reviewed-by: Sergey Shambir Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index f9e37b51901..08377b2fabd 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -118,7 +118,7 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor connect(m_modelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)), this, SLOT(onDocumentUpdated(CPlusPlus::Document::Ptr))); - if (m_highlightingSupport->requiresSemanticInfo()) { + if (m_highlightingSupport && m_highlightingSupport->requiresSemanticInfo()) { connect(this, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), this, SLOT(startHighlighting())); } @@ -191,7 +191,7 @@ void CppEditorSupport::recalculateSemanticInfoDetached(bool force) m_futureSemanticInfo = QtConcurrent::run( &CppEditorSupport::recalculateSemanticInfoDetached_helper, this, source); - if (force && !m_highlightingSupport->requiresSemanticInfo()) + if (force && m_highlightingSupport && !m_highlightingSupport->requiresSemanticInfo()) startHighlighting(); } @@ -212,7 +212,7 @@ void CppEditorSupport::updateDocumentNow() } else { m_updateDocumentTimer->stop(); - if (!m_highlightingSupport->requiresSemanticInfo()) { + if (m_highlightingSupport && !m_highlightingSupport->requiresSemanticInfo()) { startHighlighting(); }