diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-12 15:32:52 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-12 16:39:01 +0000 |
| commit | e46df080ee68c2be7b5abe8bb30ae615c333aa27 (patch) | |
| tree | 5034b30048d54a1c055be867b2128c4e8fd3c36f /src/plugins | |
| parent | 299d34d54757823014db77bf0cc9ba864353731a (diff) | |
| download | qt-creator-e46df080ee68c2be7b5abe8bb30ae615c333aa27.tar.gz | |
QmakeProjectManager: Fix null pointer access
Amends c7d8b9b01c.
Fixes: QTCREATORBUG-23596
Change-Id: I466907e02572008d0e677ff29ecd712969f8bc54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index e4a6635b3b..f3d20cb894 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(); } |