Fix memory management issue with accessors

The earlier pattern of
    Property p;
    p.setSetter(new (mm) setterFunction);
    p.setGetter(new (mm) getterFunction);
carries the risk of the second allocation garbage collecting the first one.
Consequently we need to put these values onto the JS stack, using a simple
ScopedProperty wrapper.

Change-Id: Ib29ea3b1eab95595dd6dfbb86fea282d23e3d899
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 34fb05835f..deb52c3605 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -658,6 +658,18 @@ inline ValueRef &ValueRef::operator=(const ScopedValue &o)
     return *this;
 }
 
+struct ScopedProperty
+{
+    ScopedProperty(Scope &scope)
+    {
+        property = reinterpret_cast<Property*>(scope.alloc(sizeof(Property) / sizeof(Value)));
+    }
+
+    Property *operator->() { return property; }
+    operator const Property &() { return *property; }
+
+    Property *property;
+};
 
 }