Changeset 24151

Timestamp:

07/01/2008 05:09:23 PM (5 months ago)

Author:

evands

Message:

Backported [23524] to adium-1.2:

• Avoid the possibility of modifying the set of list object observers being enumerated by copying/autoreleasing it before enumeration.
  
• Keep track of observers removed while observers are being notified, and avoid messaging them subsequently. Fixes #9425, where I wrote:
  

The problem occurs when a list object observer is unregistered and deallocates in response to the status update being posted. In this specific case, AIContactMenu is a list object observer, responds to an update by informing its delegate, which happens to be an AIAccountSelectorView. AIAccountSelectorView destroys and then recreates its AIAccountMenu... and then the enumeration of the observers continues, eventually trying to message the old AIAccountMenu, which has now been deallocated. *boom*.

Files:

• branches/adium-1.2/Source/AIContactController.h (modified) (2 diffs)
• branches/adium-1.2/Source/AIContactController.m (modified) (5 diffs)

branches/adium-1.2/Source/AIContactController.h

@@ -49 +49 @@
-        //Status and Attribute updates
-    NSMutableSet                        *contactObservers;
+        NSMutableSet                    *removedContactObservers;
-    NSTimer                                     *delayedUpdateTimer;
-    int                                         delayedStatusChanges;
@@ -57 +58 @@
-        int                                             delayedUpdateRequests;
-        BOOL                                    updatesAreDelayed;
-
+
+
-        //Sorting
-    NSMutableArray                      *sortControllerArray;

branches/adium-1.2/Source/AIContactController.m

@@ -1446 +1446 @@
-#endif  
-    [contactObservers removeObject:[NSValue valueWithNonretainedObject:inObserver]];
+        
+        /* If we're in the middle of informing observers, we need to note this now-removed observer
+         * so that we don't attempt to message it during this iteration.
+         */
+        if (informingObservers) {
+                if (!removedContactObservers) removedContactObservers = [[NSMutableSet alloc] init];
+                [removedContactObservers addObject:[NSValue valueWithNonretainedObject:inObserver]];
+        }       
-}
-
@@ -1519 +1527 @@
-        NSValue                 *observerValue;
-        
+        informingObservers = YES;
+
-        //Let our observers know
-contactObservers
+[[contactObservers copy] autorelease]
-        while ((observerValue = [enumerator nextObject])) {
-                NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-                id <AIListObjectObserver>       observer;
-                NSSet                                           *newKeys;
+
+                /* Skip any observer which has been removed while we were iterating over observers,
+                 * as we don't retain observers and therefore risk messaging a released object.
+                 */
+                if (removedContactObservers && [removedContactObservers containsObject:observerValue])
+                        continue;
-
-                observer = [observerValue nonretainedObjectValue];
@@ -1537 +1552 @@
-                        [attrChange unionSet:newKeys];
-                }
-                [pool release];
-        }
-
@@ -1545 +1559 @@
-                                                                                        userInfo:(modifiedKeys ? [NSDictionary dictionaryWithObject:modifiedKeys
-                                                                                                                                                                                                 forKey:@"Keys"] : nil)];
-
+
+
+
+
+
+
+
-        return [attrChange autorelease];
-}
@@ -1552 +1572 @@
-- (void)_updateAllAttributesOfObject:(AIListObject *)inObject
-{
-contactObservers
+[[contactObservers copy] autorelease]
-        NSValue                 *observerValue;
-
-
+
+
+
+
+
+
+
+
+
+
-                id <AIListObjectObserver> observer = [observerValue nonretainedObjectValue];
-
+
-                [observer updateListObject:inObject keys:nil silent:YES];
+        }
+
+        informingObservers = NO;
+        
+        //If we removed any observers while informing them, we don't need that information any more
+        if (removedContactObservers) {
+                [removedContactObservers release]; removedContactObservers = nil;
-        }
-}