aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4arrayobject.cpp1
-rw-r--r--src/qml/jsruntime/qv4object.cpp12
-rw-r--r--src/qml/jsruntime/qv4object_p.h1
3 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index 5422bff800..a0f0345b8b 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -572,6 +572,7 @@ ReturnedValue ArrayPrototype::method_unshift(CallContext *ctx)
--instance->arrayOffset;
--instance->arrayData;
++instance->arrayDataLen;
+ ++instance->arrayAlloc;
if (instance->arrayAttributes) {
--instance->arrayAttributes;
*instance->arrayAttributes = Attr_Data;
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 099b5a5480..df2f6ca3f4 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -1319,19 +1319,17 @@ void Object::arrayReserve(uint n)
off = arrayOffset;
}
arrayAlloc = qMax(n, 2*arrayAlloc);
- Property *newArrayData = new Property[arrayAlloc];
+ Property *newArrayData = new Property[arrayAlloc + off];
if (arrayData) {
- memcpy(newArrayData, arrayData, sizeof(Property)*arrayDataLen);
+ memcpy(newArrayData + off, arrayData, sizeof(Property)*arrayDataLen);
delete [] (arrayData - off);
}
- arrayData = newArrayData;
+ arrayData = newArrayData + off;
if (sparseArray) {
for (uint i = arrayFreeList; i < arrayAlloc; ++i) {
arrayData[i].value = Primitive::emptyValue();
arrayData[i].value = Primitive::fromInt32(i + 1);
}
- } else {
- arrayOffset = 0;
}
if (arrayAttributes) {
@@ -1354,7 +1352,9 @@ void Object::ensureArrayAttributes()
return;
flags &= ~SimpleArray;
- arrayAttributes = new PropertyAttributes[arrayAlloc];
+ uint off = sparseArray ? 0 : arrayOffset;
+ arrayAttributes = new PropertyAttributes[arrayAlloc + off];
+ arrayAttributes += off;
for (uint i = 0; i < arrayDataLen; ++i)
arrayAttributes[i] = Attr_Data;
for (uint i = arrayDataLen; i < arrayAlloc; ++i)
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 0d5955a0e7..daef18d4e2 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -210,7 +210,6 @@ struct Q_QML_EXPORT Object: Managed {
delete [] arrayAttributes;
arrayAttributes = newAttrs + arrayOffset;
}
- arrayAlloc += arrayOffset;
}
public: