From fdc63b39185c86ed787e7a359160936a53928487 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Tue, 26 Mar 2024 15:02:29 +0100
Subject: [PATCH]   * patch by Joeny Ang: fix TDbf memory leak, resolves #40709

(cherry picked from commit 961e8fb7494747a54a28af79093adc0f2e53cf37)
---
 packages/fcl-db/src/dbase/dbf.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/fcl-db/src/dbase/dbf.pas b/packages/fcl-db/src/dbase/dbf.pas
index 46771d1094..828cde92ba 100644
--- a/packages/fcl-db/src/dbase/dbf.pas
+++ b/packages/fcl-db/src/dbase/dbf.pas
@@ -1219,15 +1219,16 @@ var
 begin
   MustReleaseDbfFile := false;
   with FieldDefs do
-  begin
+  try
     if FDbfFile = nil then
     begin
+      MustReleaseDbfFile := true;
       // do not AutoCreate file
       InitDbfFile(pfReadOnly);
       FDbfFile.Open;
-      MustReleaseDbfFile := true;
     end;
     GetFieldDefsFromDbfFieldDefs;
+  finally
     if MustReleaseDbfFile then
       FreeAndNil(FDbfFile);
   end;