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

QmlJS: Don't crash if the type stack is empty

Browse Source 
Change-Id: If4e0155e8167f3edee1890dee5fd8b19623bba17
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-05-30 17:38:10 +02:00
committed by Thomas Hartmann
parent 79733e5625
commit e49b0670c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/qmljscheck.cpp
View File

@@ -1551,7 +1551,8 @@ bool Check::visit(CallExpression *ast)
// We have to allow the qsTr function for translation.
bool isTranslationFunction = (name == QLatin1String("qsTr") || name == QLatin1String("qsTrId"));
// allow adding connections with the help of the qt quick designer ui
bool isDirectInConnectionsScope = m_typeStack.last() == QLatin1String("Connections");
bool isDirectInConnectionsScope =
(!m_typeStack.isEmpty() && m_typeStack.last() == QLatin1String("Connections"));
if (!isTranslationFunction && !isDirectInConnectionsScope)
addMessage(ErrFunctionsNotSupportedInQmlUi, location);