diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:35 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:35 +0000 |
commit | 242351be25cc4cbc055595335b24fb5d23642d30 (patch) | |
tree | 2a415d33367293e74fd3c08dad24783047aa4b85 | |
parent | 38140960119f0404d44da1986cd18d8756051f71 (diff) |
merges r20356 from trunk into ruby_1_9_1.
* array.c (rb_ary_times): taint (and untrust) status should be
inherited by "ary * 0". [ruby-dev:37024]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Nov 25 16:26:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_times): taint (and untrust) status should be + inherited by "ary * 0". [ruby-dev:37024] + Tue Nov 25 15:54:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * strftime.c (rb_strftime): should not swallow incomplete @@ -2551,7 +2551,10 @@ rb_ary_times(VALUE ary, VALUE times) } len = NUM2LONG(times); - if (len == 0) return ary_new(rb_obj_class(ary), 0); + if (len == 0) { + ary2 = ary_new(rb_obj_class(ary), 0); + goto out; + } if (len < 0) { rb_raise(rb_eArgError, "negative argument"); } @@ -2566,6 +2569,7 @@ rb_ary_times(VALUE ary, VALUE times) for (i=0; i<len; i+=RARRAY_LEN(ary)) { MEMCPY(RARRAY_PTR(ary2)+i, RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary)); } + out: OBJ_INFECT(ary2, ary); return ary2; |