[[ Bug 13465 ]] Fix more memory leaks due to containers not being deleted

runrevali · runrevali · commit d9ef7a7ea493 · 2014-09-17T16:25:58.000+01:00
diff --git a/docs/notes/bugfix-13465.md b/docs/notes/bugfix-13465.md
@@ -0,0 +1 @@
+# More memory leaks in handler parameter creation
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -1123,6 +1123,14 @@ void MCDispatchCmd::exec_ctxt(MCExecContext &ctxt)
 
     ctxt . SetLineAndPos(line, pos);
     MCEngineExecDispatch(ctxt, is_function ? HT_FUNCTION : HT_MESSAGE, *t_message, t_target_ptr, params);
+    
+    // AL-2014-09-17: [[ Bug 13465 ]] Clear parameters after executing dispatch
+    tptr = params;
+    while (tptr != NULL)
+	{
+        tptr -> clear_argument();
+        tptr = tptr->getnext();
+    }
 }
 
 MCMessage::~MCMessage()
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -111,7 +111,7 @@ static Exec_stat MCKeywordsExecuteStatements(MCExecContext& ctxt, MCStatement *p
 }
 
 void MCKeywordsExecCommandOrFunction(MCExecContext& ctxt, bool resolved, MCHandler *handler, MCParameter *params, MCNameRef name, uint2 line, uint2 pos, bool platform_message, bool is_function)
-{
+{    
 	if (MCscreen->abortkey())
 	{
 		ctxt . LegacyThrow(EE_HANDLER_ABORT);
@@ -265,6 +265,14 @@ void MCKeywordsExecCommandOrFunction(MCExecContext& ctxt, bool resolved, MCHandl
         ctxt . SetExecStat(stat);
     else
         ctxt . SetExecStat(ES_NORMAL);
+
+    // AL-2014-09-17: [[ Bug 13465 ]] Clear parameters after executing command/function
+    tptr = params;
+    while (tptr != NULL)
+	{
+        tptr -> clear_argument();
+        tptr = tptr->getnext();
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/handler.cpp b/engine/src/handler.cpp
@@ -370,8 +370,10 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)
         {
             // AL-2014-09-16: [[ Bug 13454 ]] Delete created variables before deleting containers to prevent memory leak
             if (i >= npnames || !pinfo[i].is_reference)
+            {
 				delete newparams[i] -> getvar();
-            delete newparams[i];
+                delete newparams[i];
+            }
         }
 		delete newparams;
 		MCeerror->add(EE_HANDLER_BADPARAM, firstline - 1, 1, name);
@@ -503,8 +505,10 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)
         {
             // AL-2014-09-16: [[ Bug 13454 ]] Delete created variables before deleting containers to prevent memory leak
             if (i >= npnames || !pinfo[i].is_reference)
+            {
 				delete params[i] -> getvar();
-            delete params[i];
+                delete params[i];
+            }
         }
 		delete params;
 	}
diff --git a/engine/src/param.cpp b/engine/src/param.cpp
@@ -96,6 +96,10 @@ void MCParameter::setn_argument(real8 p_number)
 
 void MCParameter::clear_argument(void)
 {
+    // AL-2014-09-17: [[ Bug 13465 ]] Delete container when clearing a parameter
+    delete container;
+    container = nil;
+    var  = nil;
 	MCExecTypeRelease(value);
 }
 
diff --git a/engine/src/param.h b/engine/src/param.h
@@ -39,6 +39,8 @@ class MCParameter
 	~MCParameter(void)
 	{
 		delete exp;
+        // AL-2014-09-17: [[ Bug 13465 ]] Delete container when parameter is deleted
+        delete container;
 		MCExecTypeRelease(value);
 	}
 
diff --git a/engine/src/variable.cpp b/engine/src/variable.cpp
@@ -1227,9 +1227,7 @@ MCVarref *MCVariable::newvarref(void)
 
 MCContainer::~MCContainer(void)
 {
-	if (m_length == 0)
-		return;
-
+    // AL-2014-09-17: [[ Bug 13465 ]] Delete path array regardless of length
 	for(uindex_t i = 0; i < m_length; i++)
 		MCValueRelease(m_path[i]);
 	MCMemoryDeleteArray(m_path);
@@ -1341,6 +1339,7 @@ bool MCContainer::createwithvariable(MCVariable *p_var, MCContainer*& r_containe
 	r_container = new MCContainer;
 	r_container -> m_variable = p_var;
 	r_container -> m_length = 0;
+    r_container -> m_path = nil;
 	r_container -> m_case_sensitive = false;
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# More memory leaks in handler parameter creation`
Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,10 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)`
`370`	`370`	`{`
`371`	`371`	`// AL-2014-09-16: [[ Bug 13454 ]] Delete created variables before deleting containers to prevent memory leak`
`372`	`372`	`if (i >= npnames \|\| !pinfo[i].is_reference)`
	`373`	`+ {`
`373`	`374`	`delete newparams[i] -> getvar();`
`374`		`- delete newparams[i];`
	`375`	`+ delete newparams[i];`
	`376`	`+ }`
`375`	`377`	`}`
`376`	`378`	`delete newparams;`
`377`	`379`	`MCeerror->add(EE_HANDLER_BADPARAM, firstline - 1, 1, name);`
`@@ -503,8 +505,10 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)`
`503`	`505`	`{`
`504`	`506`	`// AL-2014-09-16: [[ Bug 13454 ]] Delete created variables before deleting containers to prevent memory leak`
`505`	`507`	`if (i >= npnames \|\| !pinfo[i].is_reference)`
	`508`	`+ {`
`506`	`509`	`delete params[i] -> getvar();`
`507`		`- delete params[i];`
	`510`	`+ delete params[i];`
	`511`	`+ }`
`508`	`512`	`}`
`509`	`513`	`delete params;`
`510`	`514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,10 @@ void MCParameter::setn_argument(real8 p_number)`
`96`	`96`
`97`	`97`	`void MCParameter::clear_argument(void)`
`98`	`98`	`{`
	`99`	`+ // AL-2014-09-17: [[ Bug 13465 ]] Delete container when clearing a parameter`
	`100`	`+ delete container;`
	`101`	`+ container = nil;`
	`102`	`+ var = nil;`
`99`	`103`	`MCExecTypeRelease(value);`
`100`	`104`	`}`
`101`	`105`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ class MCParameter`
`39`	`39`	`~MCParameter(void)`
`40`	`40`	`{`
`41`	`41`	`delete exp;`
	`42`	`+ // AL-2014-09-17: [[ Bug 13465 ]] Delete container when parameter is deleted`
	`43`	`+ delete container;`
`42`	`44`	`MCExecTypeRelease(value);`
`43`	`45`	`}`
`44`	`46`