From 2f584585e3c34871396c8dd1de4e4c03c1188492 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 1 Oct 2020 12:42:26 +0200 Subject: [PATCH] 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 Reviewed-by: Fabian Kosmale Reviewed-by: Thomas Hartmann --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 94814b74367..873534a4601 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -2179,6 +2179,9 @@ QSet > TextToModelMerger::qrcMapping() const QList TextToModelMerger::getQMLSingletons() const { QList list; + if (!m_scopeChain || !m_scopeChain->document()) + return list; + const QmlJS::Imports *imports = m_scopeChain->context()->imports( m_scopeChain->document().data());