Ticket #846: memleak-scriptableobject.patch

trunk/source/scripting/ScriptableObject.h

@@ -320 +320 @@
     }
     static void AddProperty( const CStrW& PropertyName, TGetFn Getter, TSetFn Setter = NULL )
     {
+        if (m_NativeProperties.count(PropertyName))
+            delete m_NativeProperties[PropertyName];
+
         m_NativeProperties[PropertyName] = new CJSFunctionProperty( (GetFn)Getter, (SetFn)Setter );
     }
     template<typename ReturnType, ReturnType (T::*NativeFunction)( JSContext* cx, uintN argc, jsval* argv )> 
@@ -332 +335 @@
     {
         IJSProperty* prop;
         if( PropReadOnly )
-        {
             prop = new CJSProperty<PropType, true>( (PropType IJSObject::*)Native );
-        }
         else
-        {
             prop = new CJSProperty<PropType, ReadOnly>( (PropType IJSObject::*)Native );
-        }
+
+        if (m_NativeProperties.count(PropertyName))
+            delete m_NativeProperties[PropertyName];
+
         m_NativeProperties[PropertyName] = prop;
     }
 #ifdef ALLOW_NONSHARED_NATIVES
@@ -346 +349 @@
     {
         IJSProperty* prop;
         if( PropReadOnly )
-        {
             prop = new CJSNonsharedProperty<PropType, true>( Native );
-        }
         else
             prop = new CJSNonsharedProperty<PropType, ReadOnly>( Native );
+
+        if (m_NonsharedProperties.count(PropertyName))
+            delete m_NonsharedProperties[PropertyName];
+
         m_NonsharedProperties[PropertyName] = prop;
     }
 #endif