From 0f6e5a56cb29a2c774823266ce45e2e250dcf247 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 14 Feb 2019 17:52:28 +0100 Subject: [PATCH] QmlDesigner: Avoid puppet crash If the property is invalid the propertyTypeName is a nullptr. Calling strcmp on nullptr is undefined and can result in a nullptr access. Change-Id: I270091fa1d2635019ad2e41c4a5eab9985227dcf Reviewed-by: Alessandro Portale --- .../qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 3720bdc90a2..5247f1f3836 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -267,13 +267,13 @@ static bool isList(const QQmlProperty &property) static bool isQJSValue(const QQmlProperty &property) { - return !strcmp(property.propertyTypeName(), "QJSValue"); + return property.isValid() && !strcmp(property.propertyTypeName(), "QJSValue"); } static bool isObject(const QQmlProperty &property) { /* QVariant and QJSValue can also store QObjects. Lets trust our model. */ - return (property.propertyTypeCategory() == QQmlProperty::Object + return property.isValid() && (property.propertyTypeCategory() == QQmlProperty::Object || !strcmp(property.propertyTypeName(), "QVariant") || isQJSValue(property)); }