paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 22:00:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, Debugger: fixed accessing freed watch (inspect, evel, mem-view might clear there Watch-collection, but the watch was still notified to all other windows / they will ignore it, as it isn't theirs, but the call GetTopWatch)

Browse Source 
(cherry picked from commit 622ed4d26f)
This commit is contained in:
Martin 2025-07-19 09:10:27 +02:00
parent 808924717a
commit 59ef625786
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ide/packages/idedebugger/debugger.pp
View File

@ -523,6 +523,8 @@ type
TWatchesNotificationList = class(TDebuggerNotificationList)
private
FCurWatch: TCurrentWatch;
procedure DoWatchFreed(Sender: TObject);
function GetItem(AIndex: Integer): TWatchesNotification;
public
procedure NotifyAdd(const ASender: TCurrentWatches; const AWatch: TCurrentWatch);
@ -4923,6 +4925,12 @@ begin
Result := TWatchesNotification(FList[AIndex]);
end;
procedure TWatchesNotificationList.DoWatchFreed(Sender: TObject);
begin
if Sender = FCurWatch then
FCurWatch := nil;
end;
procedure TWatchesNotificationList.NotifyAdd(const ASender: TCurrentWatches;
const AWatch: TCurrentWatch);
var
@ -4940,9 +4948,19 @@ var
i: LongInt;
begin
i := Count;
while NextDownIndex(i) do
if Assigned(Items[i].OnUpdate) then
FCurWatch := AWatch;
if FCurWatch <> nil then
FCurWatch.AddFreeNotification(@DoWatchFreed);
while NextDownIndex(i) do begin
if Assigned(Items[i].OnUpdate) then begin
Items[i].OnUpdate(ASender, AWatch);
if (AWatch <> nil) and (FCurWatch = nil) then
break; // watch got freed
end;
end;
if FCurWatch <> nil then
AWatch.RemoveFreeNotification(@DoWatchFreed);
FCurWatch := nil;
end;
procedure TWatchesNotificationList.NotifyRemove(const ASender: TCurrentWatches;