From 72195c84ef1b8e66b13893fd1c7449723d908f7a Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 1 May 2021 16:16:57 +0000
Subject: [PATCH] * Merging revisions r47343,r47344 from trunk:    
 ------------------------------------------------------------------------    
 r47343 | michael | 2020-11-08 18:05:01 +0100 (Sun, 08 Nov 2020) | 1 line

    * Fix bug #37852, possible memleak
    ------------------------------------------------------------------------
    r47344 | michael | 2020-11-08 18:10:07 +0100 (Sun, 08 Nov 2020) | 1 line

    * Correct line number
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@49320 -
---
 packages/fcl-db/src/sqldb/interbase/fbadmin.pp | 15 +++++++++------
 packages/fcl-json/src/jsonscanner.pp           |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/fcl-db/src/sqldb/interbase/fbadmin.pp b/packages/fcl-db/src/sqldb/interbase/fbadmin.pp
index 3dafa32e94..2366e83b97 100644
--- a/packages/fcl-db/src/sqldb/interbase/fbadmin.pp
+++ b/packages/fcl-db/src/sqldb/interbase/fbadmin.pp
@@ -392,13 +392,16 @@ end;
 
 destructor TFBAdmin.Destroy;
 begin
-  if FSvcHandle<>FB_API_NULLHANDLE then
-  begin
-    WaitInterval:=100;
-    DisConnect;
+  try
+    if FSvcHandle<>FB_API_NULLHANDLE then
+    begin
+      WaitInterval:=100;
+      DisConnect; // This can raise an exception
+    end;
+  Finally
+    FOutput.Destroy;
+    inherited Destroy;
   end;
-  FOutput.Destroy;
-  inherited Destroy;
 end;
 
 function TFBAdmin.Connect: boolean;
diff --git a/packages/fcl-json/src/jsonscanner.pp b/packages/fcl-json/src/jsonscanner.pp
index dc33eb5845..c81f543bcb 100644
--- a/packages/fcl-json/src/jsonscanner.pp
+++ b/packages/fcl-json/src/jsonscanner.pp
@@ -185,6 +185,8 @@ constructor TJSONScanner.Create(const aSource: RawByteString; AOptions: TJSONOpt
 begin
   FSource:=aSource;
   FCurPos:=PAnsiChar(FSource);
+  if FCurPos<>Nil then
+    FCurRow:=1;
   FOptions:=AOptions;
 end;