summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-25 14:29:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-25 14:29:39 +0000
commit405b5272766ae305c0e54267923c6950a739c262 (patch)
tree67f9db8822652939ccab87b783278bd1a6196711 /array.c
parent446ea127c331f14701a993f404e3a930055173cf (diff)
* 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/trunk@20356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/array.c b/array.c
index 5553b8ff2f..578f7fae90 100644
--- a/array.c
+++ b/array.c
@@ -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;