gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Purge observations with dead weak references when trying to remove an observer

Browse source
This commit is contained in:
rfm 2025-01-07 19:43:02 +00:00
parent 4c9c691626
commit dfd1526455
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/NSNotificationCenter.m
View file

@ -519,8 +519,10 @@ static void listFree(Observation *list)
static Observation *listPurge(Observation *list, id observer)
{
Observation *tmp;
id o;
while (list != ENDOBS && objc_loadWeak(&list->observer) == observer)
while (list != ENDOBS
&& ((o = objc_loadWeak(&list->observer)) == observer || nil == o))
{
tmp = list->next;
list->next = 0;
@ -532,7 +534,7 @@ static Observation *listPurge(Observation *list, id observer)
tmp = list;
while (tmp->next != ENDOBS)
{
if (objc_loadWeak(&tmp->next->observer) == observer)
if ((o = objc_loadWeak(&tmp->next->observer)) == observer || nil == o)
{
Observation *next = tmp->next;
@ -561,7 +563,7 @@ purgeMapNode(GSIMapTable map, GSIMapNode node, id observer)
{
Observation *list = node->value.ext;
if (observer == 0)
if (nil == observer)
{
listFree(list);
GSIMapRemoveKey(map, node->key);