diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-04 14:52:56 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-04 14:35:26 +0000 |
| commit | ccee761f06be0f62b84f944a76b0aa4dc759091f (patch) | |
| tree | f35c5e79d8db6162581a819245943f289b3e9abd /src/qml | |
| parent | bc49400b7df51312e918097de429826484fa5c61 (diff) | |
Fix segfault on invalid property alias syntax
Task-number: QTBUG-64798
Change-Id: Id1eb434f83ec89c5ea1ebaa4d8ec86fce9f4428f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 568ad4af89..0dd3cf9bfa 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -1080,7 +1080,11 @@ QQmlComponentAndAliasResolver::AliasResolutionResult QQmlComponentAndAliasResolv alias->flags |= QV4::CompiledData::Alias::AliasPointsToPointerObject; } else { QQmlPropertyCache *targetCache = propertyCaches.at(targetObjectIndex); - Q_ASSERT(targetCache); + if (!targetCache) { + *error = QQmlCompileError(alias->referenceLocation, tr("Invalid alias target location: %1").arg(property.toString())); + break; + } + QmlIR::PropertyResolver resolver(targetCache); QQmlPropertyData *targetProperty = resolver.property(property.toString()); |