Fix a couple of test failures for detached buffers

Change-Id: I76308d4699f212758274b75ea1328e7f6a6c6be8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 21 insertions, 12 deletions

diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index 21b90ad851..625d0f9961 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -450,6 +450,9 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_get_byteLength(const Function
     if (!v)
         return v4->throwTypeError();
 
+    if (v->d()->buffer->isDetachedBuffer())
+        return Encode(0);
+
     return Encode(v->d()->byteLength);
 }
 
@@ -460,6 +463,9 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_get_byteOffset(const Function
     if (!v)
         return v4->throwTypeError();
 
+    if (v->d()->buffer->isDetachedBuffer())
+        return Encode(0);
+
     return Encode(v->d()->byteOffset);
 }
 
@@ -470,17 +476,20 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_get_length(const FunctionObje
     if (!v)
         return v4->throwTypeError();
 
+    if (v->d()->buffer->isDetachedBuffer())
+        return Encode(0);
+
     return Encode(v->d()->byteLength/v->d()->type->bytesPerElement);
 }
 
 ReturnedValue IntrinsicTypedArrayPrototype::method_entries(const FunctionObject *b, const Value *thisObject, const Value *, int)
 {
     Scope scope(b);
-    Scoped<TypedArray> O(scope, thisObject);
-    if (!O)
-        THROW_TYPE_ERROR();
+    Scoped<TypedArray> v(scope, thisObject);
+    if (!v || v->d()->buffer->isDetachedBuffer())
+        return scope.engine->throwTypeError();
 
-    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(O));
+    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(v));
     ao->d()->iterationKind = IteratorKind::KeyValueIteratorKind;
     return ao->asReturnedValue();
 }
@@ -488,11 +497,11 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_entries(const FunctionObject
 ReturnedValue IntrinsicTypedArrayPrototype::method_keys(const FunctionObject *b, const Value *thisObject, const Value *, int)
 {
     Scope scope(b);
-    Scoped<TypedArray> O(scope, thisObject);
-    if (!O)
-        THROW_TYPE_ERROR();
+    Scoped<TypedArray> v(scope, thisObject);
+    if (!v || v->d()->buffer->isDetachedBuffer())
+        return scope.engine->throwTypeError();
 
-    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(O));
+    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(v));
     ao->d()->iterationKind = IteratorKind::KeyIteratorKind;
     return ao->asReturnedValue();
 }
@@ -500,11 +509,11 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_keys(const FunctionObject *b,
 ReturnedValue IntrinsicTypedArrayPrototype::method_values(const FunctionObject *b, const Value *thisObject, const Value *, int)
 {
     Scope scope(b);
-    Scoped<TypedArray> O(scope, thisObject);
-    if (!O)
-        THROW_TYPE_ERROR();
+    Scoped<TypedArray> v(scope, thisObject);
+    if (!v || v->d()->buffer->isDetachedBuffer())
+        return scope.engine->throwTypeError();
 
-    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(O));
+    Scoped<ArrayIteratorObject> ao(scope, scope.engine->newArrayIteratorObject(v));
     ao->d()->iterationKind = IteratorKind::ValueIteratorKind;
     return ao->asReturnedValue();
 }