[ CID 16680 ] libgraphics: path.cpp: Resource leak in MCGPathCopy

livecodeian · livecodeian · commit 5dc5908de675 · 2015-01-28T17:43:21.000Z
Fixed by freeing the new path on failure and returning nil.
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -118,7 +118,9 @@ bool MCGPathIsEqualTo(MCGPathRef a, MCGPathRef b)
 
 void MCGPathCopy(MCGPathRef self, MCGPathRef& r_new_path)
 {
-	if(!self -> is_mutable)
+	if (!MCGPathIsValid(self))
+		r_new_path = nil;
+	else if(!self -> is_mutable)
 		r_new_path = MCGPathRetain(self);
 	else
 	{
@@ -131,6 +133,11 @@ void MCGPathCopy(MCGPathRef self, MCGPathRef& r_new_path)
 			t_new_path -> is_mutable = false;
 			r_new_path = t_new_path;
 		}
+		else
+		{
+			MCGPathDestroy(t_new_path);
+			r_new_path = nil;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ bool MCGPathIsEqualTo(MCGPathRef a, MCGPathRef b)`
`118`	`118`
`119`	`119`	`void MCGPathCopy(MCGPathRef self, MCGPathRef& r_new_path)`
`120`	`120`	`{`
`121`		`- if(!self -> is_mutable)`
	`121`	`+ if (!MCGPathIsValid(self))`
	`122`	`+ r_new_path = nil;`
	`123`	`+ else if(!self -> is_mutable)`
`122`	`124`	`r_new_path = MCGPathRetain(self);`
`123`	`125`	`else`
`124`	`126`	`{`
`@@ -131,6 +133,11 @@ void MCGPathCopy(MCGPathRef self, MCGPathRef& r_new_path)`
`131`	`133`	`t_new_path -> is_mutable = false;`
`132`	`134`	`r_new_path = t_new_path;`
`133`	`135`	`}`
	`136`	`+ else`
	`137`	`+ {`
	`138`	`+ MCGPathDestroy(t_new_path);`
	`139`	`+ r_new_path = nil;`
	`140`	`+ }`
`134`	`141`	`}`
`135`	`142`	`}`
`136`	`143`