From e46df080ee68c2be7b5abe8bb30ae615c333aa27 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 12 Feb 2020 15:32:52 +0100 Subject: [PATCH] QmakeProjectManager: Fix null pointer access Amends c7d8b9b01c. Fixes: QTCREATORBUG-23596 Change-Id: I466907e02572008d0e677ff29ecd712969f8bc54 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: hjk --- .../qmakeprojectmanager/qmakeparsernodes.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index e4a6635b3b5..f3d20cb8941 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -1203,12 +1203,13 @@ QmakeProFile::QmakeProFile(const FilePath &filePath) : QmakePriFile(filePath) { QmakeProFile::~QmakeProFile() { qDeleteAll(m_extraCompilers); - m_parseFutureWatcher->cancel(); - m_parseFutureWatcher->waitForFinished(); - if (m_readerExact) - applyAsyncEvaluate(); - delete m_parseFutureWatcher; - + if (m_parseFutureWatcher) { + m_parseFutureWatcher->cancel(); + m_parseFutureWatcher->waitForFinished(); + if (m_readerExact) + applyAsyncEvaluate(); + delete m_parseFutureWatcher; + } cleanupProFileReaders(); }