paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-01 02:43:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Fix silent exception EAbort in TBroadcaster. Issue #35210, patch by Marcin Wiazowski.

Browse Source 
git-svn-id: trunk@60801 -
This commit is contained in:
wp 2019-03-31 10:44:36 +00:00
parent c53612413e
commit 23473d15d0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/tachart/tachartutils.pas
View File

@ -847,6 +847,7 @@ procedure TBroadcaster.Broadcast(ASender: TObject);
var
ListCopy: array of Pointer;
Exceptions: TStringList;
Aborted: Boolean;
i: Integer;
begin
if Locked then exit;
@ -860,22 +861,28 @@ begin
ListCopy[i] := List^[i];
Exceptions := nil;
Aborted := False;
try
for i := 0 to High(ListCopy) do
try
TListener(ListCopy[i]).Notify(ASender);
except
on E: Exception do begin
if not Assigned(Exceptions) then begin
Exceptions := TStringList.Create;
Exceptions.Duplicates := dupIgnore;
Exceptions.Sorted := true; // required by dupIgnore
on E: Exception do
if E is EAbort then
Aborted := true
else begin
if not Assigned(Exceptions) then begin
Exceptions := TStringList.Create;
Exceptions.Duplicates := dupIgnore;
Exceptions.Sorted := true; // required by dupIgnore
end;
Exceptions.Add(E.Message);
end;
Exceptions.Add(E.Message);
end;
end;
if Assigned(Exceptions) then
raise EBroadcasterError.Create(Trim(Exceptions.Text));
if Aborted then
Abort;
finally
Exceptions.Free;
end;