paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 13:18:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix AV in some cases. reported by Pascal Riekenberg

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-12-21 13:31:07 +01:00
parent f232009010
commit 5f845aa8ff
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fcl-db/src/base/database.inc
View File

@ -454,15 +454,14 @@ end;
procedure TDBTransaction.SetDatabase(Value: TDatabase); procedure TDBTransaction.SetDatabase(Value: TDatabase);
begin begin
If Value<>FDatabase then If Value=FDatabase then
begin exit;
CheckInactive; CheckInactive;
If Assigned(FDatabase) then If Assigned(FDatabase) then
FDatabase.UnregisterTransaction(Self); FDatabase.UnregisterTransaction(Self);
If Value<>Nil Then If Value<>Nil Then
Value.RegisterTransaction(Self); Value.RegisterTransaction(Self);
FDatabase:=Value; FDatabase:=Value;
end;
end; end;
constructor TDBTransaction.Create(AOwner: TComponent); constructor TDBTransaction.Create(AOwner: TComponent);
@ -523,9 +522,9 @@ end;
destructor TDBTransaction.Destroy; destructor TDBTransaction.Destroy;
begin begin
Database:=Nil;
CloseDataSets; CloseDataSets;
RemoveDatasets; RemoveDatasets;
Database:=Nil;
FDatasets.Free; FDatasets.Free;
Inherited; Inherited;
end; end;