Merge pull request facebookarchive#1026 from 1nput0utput/ASControlNodeMutationCrash

appleguy · appleguy · commit 8a5f080fcc00 · 2016-01-03T20:18:30.000-08:00
[ASControlNode] Copy event table before calling action methods, as they may trigger action removal.
diff --git a/AsyncDisplayKit/ASControlNode.m b/AsyncDisplayKit/ASControlNode.m
@@ -339,7 +339,8 @@ - (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:
   _ASEnumerateControlEventsIncludedInMaskWithBlock(controlEvents, ^
     (ASControlNodeEvent controlEvent)
     {
-      NSMapTable *eventDispatchTable = [_controlEventDispatchTable objectForKey:_ASControlNodeEventKeyForControlEvent(controlEvent)];
+      // Use a copy to itereate, the action perform could call remove causing a mutation crash.
+      NSMapTable *eventDispatchTable = [[_controlEventDispatchTable objectForKey:_ASControlNodeEventKeyForControlEvent(controlEvent)] copy];
 
       // For each target interested in this event...
       for (id target in eventDispatchTable)

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,8 @@ - (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:`
`339`	`339`	`_ASEnumerateControlEventsIncludedInMaskWithBlock(controlEvents, ^`
`340`	`340`	`(ASControlNodeEvent controlEvent)`
`341`	`341`	`{`
`342`		`- NSMapTable *eventDispatchTable = [_controlEventDispatchTable objectForKey:_ASControlNodeEventKeyForControlEvent(controlEvent)];`
	`342`	`+ // Use a copy to itereate, the action perform could call remove causing a mutation crash.`
	`343`	`+ NSMapTable *eventDispatchTable = [[_controlEventDispatchTable objectForKey:_ASControlNodeEventKeyForControlEvent(controlEvent)] copy];`
`343`	`344`
`344`	`345`	`// For each target interested in this event...`
`345`	`346`	`for (id target in eventDispatchTable)`