diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-03-10 15:18:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 21:00:22 +0100 |
| commit | dfed088a50298fe4a9d0eb8a9d0a2711dfc206c1 (patch) | |
| tree | 08b5ad6b162a2ca15e173aa190c961a89c5340b6 /src/qml/jsruntime/qv4object.cpp | |
| parent | f67335fc340eafba04437e4b75ce9ac3edbffc54 (diff) | |
Fix copying of Property's
Data properties don't contain valid data in the set field
if they are being stored in Objects. Thus we should never
access that field unless we are dealing with accessor
properties.
Change-Id: I19dcbaee7ebd042ae24387f92a93571d75ca578a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 7ad3189dd1..f5c1be767f 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -252,7 +252,9 @@ void Object::insertMember(const StringRef s, const Property &p, PropertyAttribut if (attributes.isAccessor()) { hasAccessorProperty = 1; - *propertyAt(idx) = p; + Property *pp = propertyAt(idx); + pp->value = p.value; + pp->set = p.set; } else { memberData[idx] = p.value; } @@ -568,7 +570,7 @@ void Object::advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uin it->arrayIndex = k + 1; *index = k; *attrs = a; - *pd = *p; + pd->copy(*p, a); return; } } @@ -604,7 +606,7 @@ void Object::advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uin if (!(it->flags & ObjectIterator::EnumerableOnly) || a.isEnumerable()) { name = n; *attrs = a; - *pd = *p; + pd->copy(*p, a); return; } } @@ -916,7 +918,8 @@ bool Object::__defineOwnProperty__(ExecutionContext *ctx, const StringRef name, if (!extensible) goto reject; // clause 4 - Property pd = p; + Property pd; + pd.copy(p, attrs); pd.fullyPopulated(&attrs); insertMember(name, pd, attrs); return true; @@ -961,7 +964,8 @@ bool Object::defineOwnProperty2(ExecutionContext *ctx, uint index, const Propert if (!extensible) goto reject; // clause 4 - Property pp(p); + Property pp; + pp.copy(p, attrs); pp.fullyPopulated(&attrs); if (attrs == Attr_Data) { Scope scope(ctx); |