Merge pull request #6985 from runrevmark/bugfix-22009

livecodeali · web-flow · commit 9e9399127806 · 2019-04-19T20:42:32.000+01:00
[[ Bug 22009 ]] Fix memory leak when releasing LCB objects
diff --git a/docs/notes/bugfix-22009.md b/docs/notes/bugfix-22009.md
@@ -0,0 +1 @@
+# Fix memory leaks when releasing loaded LCB modules and instances
diff --git a/libfoundation/src/foundation-pickle.cpp b/libfoundation/src/foundation-pickle.cpp
@@ -978,6 +978,8 @@ static void MCPickleReleaseField(MCPickleFieldType p_kind, void *p_base_ptr, voi
                                 MCPickleRelease(t_info -> cases[t_case] . record, t_variant);
                                 break;
                             }
+                        
+                        free(t_variant);
                     }
                 }
                 free(*(void **)p_field_ptr);
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -253,6 +253,8 @@ void MCScriptDestroyObject(MCScriptObject *self)
             __MCScriptAssert__(false, "invalid kind");
             break;
     }
+    
+    MCMemoryDeallocate(self);
 }
 
 MCScriptObject *MCScriptRetainObject(MCScriptObject *self)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix memory leaks when releasing loaded LCB modules and instances`
Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,8 @@ static void MCPickleReleaseField(MCPickleFieldType p_kind, void *p_base_ptr, voi`
`978`	`978`	`MCPickleRelease(t_info -> cases[t_case] . record, t_variant);`
`979`	`979`	`break;`
`980`	`980`	`}`
	`981`	`+`
	`982`	`+ free(t_variant);`
`981`	`983`	`}`
`982`	`984`	`}`
`983`	`985`	`free((void *)p_field_ptr);`
Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,8 @@ void MCScriptDestroyObject(MCScriptObject *self)`
`253`	`253`	`__MCScriptAssert__(false, "invalid kind");`
`254`	`254`	`break;`
`255`	`255`	`}`
	`256`	`+`
	`257`	`+ MCMemoryDeallocate(self);`
`256`	`258`	`}`
`257`	`259`
`258`	`260`	`MCScriptObject MCScriptRetainObject(MCScriptObject self)`