* Amend Patch for bug id #21594, fixing possible AV in corner cases

git-svn-id: trunk@39592 -
This commit is contained in:
michael 2018-08-08 05:00:40 +00:00
parent e4346b264f
commit 6603bf149a

View File

@ -73,6 +73,12 @@ Procedure TDataLink.CalcRange;
var
aMax, aMin: integer;
begin
// During loading, dataset may not be set yet.
If (Dataset=Nil) then
begin
FFirstRecord:=0;
exit;
end;
aMin:= DataSet.FActiveRecord - FBufferCount + 1;
If aMin < 0 Then aMin:= 0;
aMax:= Dataset.FBufferCount - FBufferCount;
@ -609,8 +615,8 @@ begin
End;
If ADataset<>Nil Then
begin
ADataset.RegisterDatasource(Self);
FDataSet:=ADataset;
ADataset.RegisterDatasource(Self);
ProcessEvent(deUpdateState,0);
End;
end;