Fix another ubsan warning

Don't call asReturnedValue() on something that might be null.

Change-Id: I31ab7df7e353dee0718957ec0d5b4edcc72f7a56
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 93cc3a1e4b..b5aac35722 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -97,7 +97,7 @@ DECLARE_EXPORTED_HEAP_OBJECT(Object, Base) {
     void setInlineProperty(ExecutionEngine *e, uint index, Heap::Base *b) {
         Q_ASSERT(index < vtable()->nInlineProperties);
         Value *prop = reinterpret_cast<Value *>(this) + vtable()->inlinePropertyOffset + index;
-        WriteBarrier::write(e, this, prop->data_ptr(), b->asReturnedValue());
+        WriteBarrier::write(e, this, prop->data_ptr(), Value::fromHeapObject(b).asReturnedValue());
     }
 
     PropertyIndex writablePropertyData(uint index) {
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 899c1c7a06..d2d19f005e 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -892,7 +892,7 @@ struct ValueArray {
         WriteBarrier::write(e, base(), values[index].data_ptr(), v.asReturnedValue());
     }
     void set(EngineBase *e, uint index, Heap::Base *b) {
-        WriteBarrier::write(e, base(), values[index].data_ptr(), b->asReturnedValue());
+        WriteBarrier::write(e, base(), values[index].data_ptr(), Value::fromHeapObject(b).asReturnedValue());
     }
     inline const Value &operator[] (uint index) const {
         Q_ASSERT(index < alloc);