Browse Source

* Fix bug #33389, AV if there are no pages yet in a report

git-svn-id: trunk@38466 -
michael 7 years ago
parent
commit
27b0165689
1 changed files with 10 additions and 5 deletions
  1. 10 5
      packages/fcl-report/src/fpreport.pp

+ 10 - 5
packages/fcl-report/src/fpreport.pp

@@ -7823,12 +7823,17 @@ begin
   // Collections
   // Collections
   FreeAndNil(FExpr); // Special case, recreated on run
   FreeAndNil(FExpr); // Special case, recreated on run
   FReportData.Clear;
   FReportData.Clear;
-  While FPages.Count>0 do
-    RemovePage(Pages[FPages.Count-1]);
-  FPages.Clear;
+  if Assigned(FPages) then
+    begin
+    While PageCount>0 do
+      RemovePage(Pages[FPages.Count-1]);
+    FPages.Clear;
+    end;
   ClearReferenceList;
   ClearReferenceList;
-  FImages.Clear;
-  FVariables.Clear;
+  If Assigned(Fimages) then
+    FImages.Clear;
+  If Assigned(FVariables) then
+    FVariables.Clear;
 end;
 end;
 
 
 procedure TFPCustomReport.SaveDataToNames;
 procedure TFPCustomReport.SaveDataToNames;