Check that value type exists before creating wrapper

Fixes: QTBUG-82843
Change-Id: I1ea4a52b33e7d318525e63346eab46ecf7a8fec0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 12 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index ba5ba96cbe..aa7e28add0 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -192,7 +192,12 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, QObject *obj
     r->d()->object = object;
     r->d()->property = property;
     r->d()->setPropertyCache(QJSEnginePrivate::get(engine)->cache(metaObject));
-    r->d()->setValueType(QQmlValueTypeFactory::valueType(typeId));
+    auto valueType = QQmlValueTypeFactory::valueType(typeId);
+    if (!valueType) {
+        QMetaType metaType(typeId);
+        return engine->throwTypeError(QLatin1String("Type %1 is not a value type").arg(metaType.name()));
+    }
+    r->d()->setValueType(valueType);
     r->d()->setGadgetPtr(nullptr);
     return r->asReturnedValue();
 }
@@ -204,7 +209,12 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, const QVaria
 
     Scoped<QQmlValueTypeWrapper> r(scope, engine->memoryManager->allocate<QQmlValueTypeWrapper>());
     r->d()->setPropertyCache(QJSEnginePrivate::get(engine)->cache(metaObject));
-    r->d()->setValueType(QQmlValueTypeFactory::valueType(typeId));
+    auto valueType = QQmlValueTypeFactory::valueType(typeId);
+    if (!valueType) {
+        QMetaType metaType(typeId);
+        return engine->throwTypeError(QLatin1String("Type %1 is not a value type").arg(metaType.name()));
+    }
+    r->d()->setValueType(valueType);
     r->d()->setGadgetPtr(nullptr);
     r->d()->setValue(value);
     return r->asReturnedValue();