paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-30 05:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r47343,r47344 from trunk:

Browse Source 
------------------------------------------------------------------------
    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 -
This commit is contained in:
michael 2021-05-01 16:16:57 +00:00
parent c6175fdd3a
commit 72195c84ef
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-db/src/sqldb/interbase/fbadmin.pp
View File

@ -392,13 +392,16 @@ end;
destructor TFBAdmin.Destroy; destructor TFBAdmin.Destroy;
begin begin
if FSvcHandle<>FB_API_NULLHANDLE then try
begin if FSvcHandle<>FB_API_NULLHANDLE then
WaitInterval:=100; begin
DisConnect; WaitInterval:=100;
DisConnect; // This can raise an exception
end;
Finally
FOutput.Destroy;
inherited Destroy;
end; end;
FOutput.Destroy;
inherited Destroy;
end; end;
function TFBAdmin.Connect: boolean; function TFBAdmin.Connect: boolean;

2
packages/fcl-json/src/jsonscanner.pp
View File

@ -185,6 +185,8 @@ constructor TJSONScanner.Create(const aSource: RawByteString; AOptions: TJSONOpt
begin begin
FSource:=aSource; FSource:=aSource;
FCurPos:=PAnsiChar(FSource); FCurPos:=PAnsiChar(FSource);
if FCurPos<>Nil then
FCurRow:=1;
FOptions:=AOptions; FOptions:=AOptions;
end; end;