From f6918dac3e9dddf4754e338daae6cf9336cba263 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 24 Aug 2017 14:53:33 +0000
Subject: [PATCH] * Fix from Graeme Geldenhuys to avoid memleaks by early exit

git-svn-id: trunk@37054 -
---
 packages/fcl-report/demos/fcldemo.lpi | 2 +-
 packages/fcl-report/demos/udapp.pp    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/fcl-report/demos/fcldemo.lpi b/packages/fcl-report/demos/fcldemo.lpi
index 4523fde9fe..d1f686c911 100644
--- a/packages/fcl-report/demos/fcldemo.lpi
+++ b/packages/fcl-report/demos/fcldemo.lpi
@@ -105,7 +105,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="polygon;../units/$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="polygon;../src"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
diff --git a/packages/fcl-report/demos/udapp.pp b/packages/fcl-report/demos/udapp.pp
index a102b858ad..46f6c09a51 100644
--- a/packages/fcl-report/demos/udapp.pp
+++ b/packages/fcl-report/demos/udapp.pp
@@ -331,8 +331,7 @@ begin
   Writeln('');
   Writeln('Known demos for this binary: ');
   ListReports(True);
-  Free;
-  Halt(Ord(Msg<>''));
+  ExitCode:=Ord(Msg<>'')
 end;
 
 procedure TReportDemoApplication.ListReports(AWithIndentation: boolean);
@@ -421,7 +420,11 @@ begin
   OnGetApplicationName:=@GetReportAppName;
   S:=CheckOptions('lj::hf:r:d:',['list','json::','help','format:','runtime:','demo:']);
   if (S<>'') or HasOption('h','help') then
+  begin
     Usage(S);
+    Terminate;
+    exit;
+  end;
   if HasOption('l','list') then
     begin
     ListReports;