Fix Object::getOwnProperty API

Don't return a Proprety pointer, this has issues with
StringObject. Instead pass in a pointer that will get filled
with the correct data.

Change-Id: I28536ca129f5be3a4a1bc9583223521458411195
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

5 files changed, 31 insertions, 27 deletions

diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 1f32ba283e..170585abe4 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -220,41 +220,44 @@ void Object::insertMember(String *s, const Property *p, PropertyAttributes attri
 }
 
 // Section 8.12.1
-Property *Object::__getOwnProperty__(String *name, PropertyAttributes *attrs)
+void Object::getOwnProperty(String *name, PropertyAttributes *attrs, Property *p)
 {
     uint idx = name->asArrayIndex();
     if (idx != UINT_MAX)
-        return __getOwnProperty__(idx, attrs);
+        return getOwnProperty(idx, attrs, p);
 
     uint member = internalClass()->find(name);
     if (member < UINT_MAX) {
-        if (attrs)
-            *attrs = internalClass()->propertyData[member];
-        return propertyAt(member);
+        *attrs = internalClass()->propertyData[member];
+        if (p)
+            p->copy(propertyAt(member), *attrs);
+        return;
     }
 
     if (attrs)
         *attrs = Attr_Invalid;
-    return 0;
+    return;
 }
 
-Property *Object::__getOwnProperty__(uint index, PropertyAttributes *attrs)
+void Object::getOwnProperty(uint index, PropertyAttributes *attrs, Property *p)
 {
-    Property *p = arrayData() ? arrayData()->getProperty(index) : 0;
-    if (p) {
-        if (attrs)
-            *attrs = arrayData()->attributes(index);
-        return p;
+    Property *pd = arrayData() ? arrayData()->getProperty(index) : 0;
+    if (pd) {
+        *attrs = arrayData()->attributes(index);
+        if (p)
+            p->copy(pd, *attrs);
+        return;
     }
     if (isStringObject()) {
-        if (attrs)
-            *attrs = Attr_NotConfigurable|Attr_NotWritable;
-        return static_cast<StringObject *>(this)->getIndex(index);
+        *attrs = Attr_NotConfigurable|Attr_NotWritable;
+        if (p)
+            p->copy(static_cast<StringObject *>(this)->getIndex(index), *attrs);
+        return;
     }
 
     if (attrs)
         *attrs = Attr_Invalid;
-    return 0;
+    return;
 }
 
 // Section 8.12.2
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index e5055e20c0..6a0c38abec 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -144,8 +144,8 @@ struct Q_QML_EXPORT Object: Managed {
     Heap::Object *prototype() const { return d()->prototype; }
     bool setPrototype(Object *proto);
 
-    Property *__getOwnProperty__(String *name, PropertyAttributes *attrs = 0);
-    Property *__getOwnProperty__(uint index, PropertyAttributes *attrs = 0);
+    void getOwnProperty(String *name, PropertyAttributes *attrs, Property *p = 0);
+    void getOwnProperty(uint index, PropertyAttributes *attrs, Property *p = 0);
 
     Property *__getPropertyDescriptor__(String *name, PropertyAttributes *attrs = 0) const;
     Property *__getPropertyDescriptor__(uint index, PropertyAttributes *attrs = 0) const;
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 19233583e3..41483e9ef5 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -141,8 +141,9 @@ ReturnedValue ObjectPrototype::method_getOwnPropertyDescriptor(CallContext *ctx)
     if (scope.hasException())
         return Encode::undefined();
     PropertyAttributes attrs;
-    Property *desc = O->__getOwnProperty__(name, &attrs);
-    return fromPropertyDescriptor(scope.engine, desc, attrs);
+    Property desc;
+    O->getOwnProperty(name, &attrs, &desc);
+    return fromPropertyDescriptor(scope.engine, &desc, attrs);
 }
 
 ReturnedValue ObjectPrototype::method_getOwnPropertyNames(CallContext *context)
@@ -463,7 +464,7 @@ ReturnedValue ObjectPrototype::method_propertyIsEnumerable(CallContext *ctx)
     if (scope.engine->hasException)
         return Encode::undefined();
     PropertyAttributes attrs;
-    o->__getOwnProperty__(p, &attrs);
+    o->getOwnProperty(p, &attrs);
     return Encode(attrs.isEnumerable());
 }
 
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 7ffd763bb8..319768746b 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -125,10 +125,11 @@ void StringObject::advanceIterator(Managed *m, ObjectIterator *it, Heap::String
             *index = it->arrayIndex;
             ++it->arrayIndex;
             PropertyAttributes a;
-            Property *pd = s->__getOwnProperty__(*index, &a);
+            Property pd;
+            s->getOwnProperty(*index, &a, &pd);
             if (!(it->flags & ObjectIterator::EnumerableOnly) || a.isEnumerable()) {
                 *attrs = a;
-                p->copy(pd, a);
+                p->copy(&pd, a);
                 return;
             }
         }
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index 9b921b9fad..6fbfc844c8 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -278,10 +278,9 @@ void QmlContextWrapper::put(Managed *m, String *name, const Value &value)
         return;
     QV4::Scoped<QmlContextWrapper> wrapper(scope, resource);
 
-    PropertyAttributes attrs;
-    Property *pd  = wrapper->__getOwnProperty__(name, &attrs);
-    if (pd) {
-        wrapper->putValue(pd, attrs, value);
+    uint member = wrapper->internalClass()->find(name);
+    if (member < UINT_MAX) {
+        wrapper->putValue(wrapper->propertyAt(member), wrapper->internalClass()->propertyData[member], value);
         return;
     }