lazarus bugtracker

Index: components/fpvectorial/fpvectorial.pas
===================================================================
--- components/fpvectorial/fpvectorial.pas	(révision 37237)
+++ components/fpvectorial/fpvectorial.pas	(copie de travail)
@@ -221,6 +226,7 @@
     CurPoint: TPathSegment; // Used in PrepareForSequentialReading and Next
     ClipPath: TPath;
     ClipMode: TvClipMode;
+    destructor Destroy; override;
     procedure Assign(ASource: TPath);
     procedure PrepareForSequentialReading;
     function Next(): TPathSegment;
@@ -1016,7 +1022,7 @@
 procedure TvVectorialPage.CallbackDeleteEntity(data, arg: pointer);
 begin
   if (data <> nil) then
-    TvEntity(data).Free;
+    FreeAndNil(TvEntity(data));
 end;
 
 constructor TvVectorialPage.Create(AOwner: TvVectorialDocument);
@@ -1032,7 +1038,8 @@
 begin
   Clear;
 
-  FEntities.Free;
+  FreeAndNil(FEntities);
+  FreeAndNil(FTmpPath);
 
   inherited Destroy;
 end;
@@ -1612,7 +1619,7 @@
 begin
   Clear;
 
-  FPages.Free;
+  FreeAndNil(FPages);
 
   inherited Destroy;
 end;
@@ -1887,7 +1894,19 @@
   Clears all data in the document
 }
 procedure TvVectorialDocument.Clear;
+//GM Release memory for each page
+var
+  i: integer;
+  p: TvVectorialPage;
 begin
+  for i:=FPages.Count-1 downto 0 do begin
+    p:=TvVectorialPage(FPages[i]);
+    p.Clear;
+    FreeAndNil(p);
+  end;
+  FPages.Clear;
+  FCurrentPageIndex:=-1;
+//GM
 end;
 
 { TvCustomVectorialReader }
@@ -1998,6 +2017,35 @@
 
 { TPath }
 
+destructor TPath.Destroy;
+var
+   p,pp,np: TPathSegment;
+begin
+  //GM: Follow the path to cleanly release the chained list!
+  p:=PointsEnd;
+  if (p<>nil) then begin
+    np:=p.Next;
+    while (p<>nil) do begin
+      pp:=p.Previous;
+      p.Next:=nil;
+      p.Previous:=nil;
+      FreeAndNil(p);
+      p:=pp;
+    end;
+    p:=np;
+    while (p<>nil) do begin
+      np:=p.Next;
+      p.Next:=nil;
+      p.Previous:=nil;
+      FreeAndNil(p);
+      p:=np;
+    end;
+  end;
+  PointsEnd:=nil;
+  Points:=nil;
+  inherited Destroy;
+end;
+
 procedure TPath.Assign(ASource: TPath);
 begin
   Len := ASource.Len;