diff options
| author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-10-01 12:42:26 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-10-03 19:33:46 +0000 |
| commit | 2f584585e3c34871396c8dd1de4e4c03c1188492 (patch) | |
| tree | 004885c390a9c71597bdb36da2424210253d5c97 | |
| parent | 2e39132debcff470905835ed2494fce581180cca (diff) | |
qmldesigner: Avoid crash of TextToModelMerger::getQMLSingletons()
When m_scopeChain is invalid (due to an invalid ui file)
getQMLSingletons would trigger a crash. Catch this case
and return early (an error message would then be displayed).
Fixes: QTCREATORBUG-24587
Change-Id: I80c70d8e7f1c88b14c53d3daebf957dc1e6089ee
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 94814b7436..873534a460 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -2179,6 +2179,9 @@ QSet<QPair<QString, QString> > TextToModelMerger::qrcMapping() const QList<QmlTypeData> TextToModelMerger::getQMLSingletons() const { QList<QmlTypeData> list; + if (!m_scopeChain || !m_scopeChain->document()) + return list; + const QmlJS::Imports *imports = m_scopeChain->context()->imports( m_scopeChain->document().data()); |