* array.c (rb_ary_collect): must get length of array for each

unak · unak · commit 2047c47d638b · 2003-07-31T06:30:35.000Z
iteration. reported on [ruby-talk:77500], and fixed by
	  K.Sasada &lt;ko1@namikilab.tuat.ac.jp&gt; on [ruby-talk:77504]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 31 15:25:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* array.c (rb_ary_collect): must get length of array for each
+	  iteration. reported on [ruby-talk:77500], and fixed by
+	  K.Sasada <ko1@namikilab.tuat.ac.jp> on [ruby-talk:77504]
+
 Thu Jul 31 14:11:54 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: move gmake specific features
diff --git a/array.c b/array.c
@@ -1190,16 +1190,15 @@ static VALUE
 rb_ary_collect(ary)
     VALUE ary;
 {
-    long len, i;
+    long i;
     VALUE collect;
 
     if (!rb_block_given_p()) {
 	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
     }
 
-    len = RARRAY(ary)->len;
-    collect = rb_ary_new2(len);
-    for (i=0; i<len; i++) {
+    collect = rb_ary_new2(RARRAY(ary)->len);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
 	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
     }
     return collect;

Original file line number	Diff line number	Diff line change
`@@ -1190,16 +1190,15 @@ static VALUE`
`1190`	`1190`	`rb_ary_collect(ary)`
`1191`	`1191`	`VALUE ary;`
`1192`	`1192`	`{`
`1193`		`- long len, i;`
	`1193`	`+ long i;`
`1194`	`1194`	`VALUE collect;`
`1195`	`1195`
`1196`	`1196`	`if (!rb_block_given_p()) {`
`1197`	`1197`	`return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);`
`1198`	`1198`	`}`
`1199`	`1199`
`1200`		`- len = RARRAY(ary)->len;`
`1201`		`- collect = rb_ary_new2(len);`
`1202`		`- for (i=0; i<len; i++) {`
	`1200`	`+ collect = rb_ary_new2(RARRAY(ary)->len);`
	`1201`	`+ for (i = 0; i < RARRAY(ary)->len; i++) {`
`1203`	`1202`	`rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));`
`1204`	`1203`	`}`
`1205`	`1204`	`return collect;`