[fix #122] receiver object may be changed within NSArray#each block

MacRuby · Jul 5, 2012 · 4ea6d4b · 4ea6d4b
1 parent 85f5996
commit 4ea6d4b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/NSArray.m b/NSArray.m
@@ -462,9 +462,15 @@
 nsary_each(id rcv, SEL sel)
 {
     RETURN_ENUMERATOR(rcv, 0, 0);
-    for (id item in rcv) {
-	rb_yield(OC2RB(item));
+    long len = [rcv count];
+    for (long i = 0; i < len; i++) {
+	rb_yield(OC2RB([rcv objectAtIndex:i]));
 	RETURN_IF_BROKEN();
+	const long n = [rcv count];
+	if (n < len) {
+	    // Array was modified.
+	    len = n;
+	}
     }
     return (VALUE)rcv;
 }