Fix memory leak

Rubjerg · Feb 16, 2024 · 7b5ca5b · 7b5ca5b
1 parent 45f9e38
commit 7b5ca5b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Rubjerg.Graphviz.Test/TestDotLayout.cs b/Rubjerg.Graphviz.Test/TestDotLayout.cs
@@ -32,13 +32,13 @@ public void TestLayoutMethodsWithoutLayout()
     {
         CreateSimpleTestGraph(out RootGraph root, out Node nodeA, out Edge edge);
 
-        Assert.AreEqual(root.GetBoundingBox(), default(RectangleD));
+        Assert.AreEqual(default(RectangleD), root.GetBoundingBox(), "Unexpected graph boundingbox");
         Assert.AreEqual(root.GetDrawing().Count, 0);
         Assert.AreEqual(root.GetLabelDrawing().Count, 0);
 
-        Assert.AreEqual(nodeA.GetPosition(), default(PointD));
-        Assert.AreEqual(nodeA.GetBoundingBox(), default(RectangleD));
-        Assert.AreEqual(nodeA.GetSize(), default(SizeD));
+        Assert.AreEqual(default(PointD), nodeA.GetPosition(), "Unexpected node position");
+        Assert.AreEqual(default(RectangleD), nodeA.GetBoundingBox(), "Unexpected node boundingbox");
+        Assert.AreEqual(default(SizeD), nodeA.GetSize(), "Unexpected node size");
         Assert.AreEqual(nodeA.GetRecordRectangles().Count(), 0);
         Assert.AreEqual(nodeA.GetDrawing().Count, 0);
         Assert.AreEqual(nodeA.GetLabelDrawing().Count, 0);

diff --git a/Rubjerg.Graphviz/XDotParser.cs b/Rubjerg.Graphviz/XDotParser.cs
@@ -35,7 +35,17 @@ internal static class XDotParser
     public static List<XDotOp> ParseXDot(string xdotString, CoordinateSystem coordinateSystem, double maxY)
     {
         IntPtr xdot = XDotFFI.ParseXDot(xdotString);
-        return TranslateXDot(xdot, coordinateSystem, maxY);
+        try
+        {
+            return TranslateXDot(xdot, coordinateSystem, maxY);
+        }
+        finally
+        {
+            if (xdot != IntPtr.Zero)
+            {
+                XDotFFI.freeXDot(xdot);
+            }
+        }
     }
 
     internal static List<XDotOp> TranslateXDot(IntPtr xdotPtr, CoordinateSystem coordinateSystem, double maxY)