feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: fix possible null-pointer derefs.

Browse Source 
Change-Id: Ie6a2398f3a9e5c26a9af1578e512da53a01d15f5
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-05-02 11:28:12 +02:00
committed by Nikolai Kosjar
parent 6344e2a02b
commit 364c95476e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -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, void>(
&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();
}