1 files changed, 19 insertions, 21 deletions

diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index d83f021450..43e1dabb6d 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -459,24 +459,23 @@ Heap::TypedArray *TypedArray::create(ExecutionEngine *e, Heap::TypedArray::Type
 
 ReturnedValue TypedArray::virtualGet(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty)
 {
-    uint index = id.asArrayIndex();
-    if (index == UINT_MAX && !id.isCanonicalNumericIndexString())
+    const bool isArrayIndex = id.isArrayIndex();
+    if (!isArrayIndex && !id.isCanonicalNumericIndexString())
         return Object::virtualGet(m, id, receiver, hasProperty);
-    // fall through, with index == UINT_MAX it'll do the right thing.
 
     Scope scope(static_cast<const Object *>(m)->engine());
     Scoped<TypedArray> a(scope, static_cast<const TypedArray *>(m));
     if (a->d()->buffer->isDetachedBuffer())
         return scope.engine->throwTypeError();
 
-    if (index >= a->length()) {
+    if (!isArrayIndex || id.asArrayIndex() >= a->length()) {
         if (hasProperty)
             *hasProperty = false;
         return Encode::undefined();
     }
 
     uint bytesPerElement = a->d()->type->bytesPerElement;
-    uint byteOffset = a->d()->byteOffset + index * bytesPerElement;
+    uint byteOffset = a->d()->byteOffset + id.asArrayIndex() * bytesPerElement;
     Q_ASSERT(byteOffset + bytesPerElement <= (uint)a->d()->buffer->byteLength());
 
     if (hasProperty)
@@ -486,27 +485,22 @@ ReturnedValue TypedArray::virtualGet(const Managed *m, PropertyKey id, const Val
 
 bool TypedArray::virtualHasProperty(const Managed *m, PropertyKey id)
 {
-    uint index = id.asArrayIndex();
-    if (index == UINT_MAX && !id.isCanonicalNumericIndexString())
+    const bool isArrayIndex = id.isArrayIndex();
+    if (!isArrayIndex && !id.isCanonicalNumericIndexString())
         return Object::virtualHasProperty(m, id);
-    // fall through, with index == UINT_MAX it'll do the right thing.
 
     const TypedArray *a = static_cast<const TypedArray *>(m);
     if (a->d()->buffer->isDetachedBuffer()) {
         a->engine()->throwTypeError();
         return false;
     }
-    if (index >= a->length())
-        return false;
-    return true;
+    return isArrayIndex && id.asArrayIndex() < a->length();
 }
 
 PropertyAttributes TypedArray::virtualGetOwnProperty(const Managed *m, PropertyKey id, Property *p)
 {
-    uint index = id.asArrayIndex();
-    if (index == UINT_MAX && !id.isCanonicalNumericIndexString())
+    if (!id.isArrayIndex() && !id.isCanonicalNumericIndexString())
         return Object::virtualGetOwnProperty(m, id, p);
-    // fall through, with index == UINT_MAX it'll do the right thing.
 
     bool hasProperty = false;
     ReturnedValue v = virtualGet(m, id, m, &hasProperty);
@@ -517,10 +511,9 @@ PropertyAttributes TypedArray::virtualGetOwnProperty(const Managed *m, PropertyK
 
 bool TypedArray::virtualPut(Managed *m, PropertyKey id, const Value &value, Value *receiver)
 {
-    uint index = id.asArrayIndex();
-    if (index == UINT_MAX && !id.isCanonicalNumericIndexString())
+    const bool isArrayIndex = id.isArrayIndex();
+    if (!isArrayIndex && !id.isCanonicalNumericIndexString())
         return Object::virtualPut(m, id, value, receiver);
-    // fall through, with index == UINT_MAX it'll do the right thing.
 
     ExecutionEngine *v4 = static_cast<Object *>(m)->engine();
     if (v4->hasException)
@@ -531,6 +524,10 @@ bool TypedArray::virtualPut(Managed *m, PropertyKey id, const Value &value, Valu
     if (a->d()->buffer->isDetachedBuffer())
         return scope.engine->throwTypeError();
 
+    if (!isArrayIndex)
+        return false;
+
+    const uint index = id.asArrayIndex();
     if (index >= a->length())
         return false;
 
@@ -547,11 +544,12 @@ bool TypedArray::virtualPut(Managed *m, PropertyKey id, const Value &value, Valu
 
 bool TypedArray::virtualDefineOwnProperty(Managed *m, PropertyKey id, const Property *p, PropertyAttributes attrs)
 {
-    uint index = id.asArrayIndex();
-    if (index == UINT_MAX && !id.isCanonicalNumericIndexString())
-        return Object::virtualDefineOwnProperty(m, id, p, attrs);
-    // fall through, with index == UINT_MAX it'll do the right thing.
+    if (!id.isArrayIndex()) {
+        return !id.isCanonicalNumericIndexString()
+                && Object::virtualDefineOwnProperty(m, id, p, attrs);
+    }
 
+    const uint index = id.asArrayIndex();
     TypedArray *a = static_cast<TypedArray *>(m);
     if (index >= a->length() || attrs.isAccessor())
         return false;