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

QmakeProject: Fix crash on unloading project while parsing

Browse Source 
Callign applyAsyncEvaluate in the desctructor might lead to further
parses, which we don't want. So bail out early in applyAsyncEvaluate.

Task-number: QTCREATORBUG-13421
Change-Id: I776ff477363a3985ebc26e9160c58c2ab9c910b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Daniel Teske
2014-11-18 17:05:09 +01:00
parent 7f72b7bf65
commit f6a9d01ddf
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -2026,6 +2026,11 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
if (!m_readerExact) if (!m_readerExact)
return; return;
if (m_project->asyncUpdateState() == QmakeProject::ShuttingDown) {
cleanupProFileReaders();
return;
}
foreach (const QString &error, evalResult->errors) foreach (const QString &error, evalResult->errors)
QmakeProject::proFileParseError(error); QmakeProject::proFileParseError(error);
@@ -2258,6 +2263,11 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
updateUiFiles(buildDirectory); updateUiFiles(buildDirectory);
cleanupProFileReaders();
}
void QmakeProFileNode::cleanupProFileReaders()
{
m_project->destroyProFileReader(m_readerExact); m_project->destroyProFileReader(m_readerExact);
m_project->destroyProFileReader(m_readerCumulative); m_project->destroyProFileReader(m_readerCumulative);

1
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -447,6 +447,7 @@ private:
void applyEvaluate(Internal::EvalResult *parseResult); void applyEvaluate(Internal::EvalResult *parseResult);
void asyncEvaluate(QFutureInterface<Internal::EvalResult *> &fi, Internal::EvalInput input); void asyncEvaluate(QFutureInterface<Internal::EvalResult *> &fi, Internal::EvalInput input);
void cleanupProFileReaders();
typedef QHash<QmakeVariable, QStringList> QmakeVariablesHash; typedef QHash<QmakeVariable, QStringList> QmakeVariablesHash;

5
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1675,6 +1675,11 @@ ProjectImporter *QmakeProject::createProjectImporter() const
return new QmakeProjectImporter(projectFilePath().toString()); return new QmakeProjectImporter(projectFilePath().toString());
} }
QmakeProject::AsyncUpdateState QmakeProject::asyncUpdateState() const
{
return m_asyncUpdateState;
}
} // namespace QmakeProjectManager } // namespace QmakeProjectManager
#include "qmakeproject.moc" #include "qmakeproject.moc"

4
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -141,6 +141,9 @@ public:
ProjectExplorer::ProjectImporter *createProjectImporter() const; ProjectExplorer::ProjectImporter *createProjectImporter() const;
enum AsyncUpdateState { Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
AsyncUpdateState asyncUpdateState() const;
signals: signals:
void proFileUpdated(QmakeProjectManager::QmakeProFileNode *node, bool, bool); void proFileUpdated(QmakeProjectManager::QmakeProFileNode *node, bool, bool);
void buildDirectoryInitialized(); void buildDirectoryInitialized();
@@ -203,7 +206,6 @@ private:
QTimer m_asyncUpdateTimer; QTimer m_asyncUpdateTimer;
QFutureInterface<void> *m_asyncUpdateFutureInterface; QFutureInterface<void> *m_asyncUpdateFutureInterface;
int m_pendingEvaluateFuturesCount; int m_pendingEvaluateFuturesCount;
enum AsyncUpdateState { Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
AsyncUpdateState m_asyncUpdateState; AsyncUpdateState m_asyncUpdateState;
bool m_cancelEvaluate; bool m_cancelEvaluate;
QList<QmakeProFileNode *> m_partialEvaluate; QList<QmakeProFileNode *> m_partialEvaluate;