aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-13 16:39:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-13 16:39:45 +0000
commit92f510a9d9014afdaa2f26a04ff250455ea35162 (patch)
treec1b87b6a21743408ae12ef0a30df8cb92d928e4e
parent020d4e4d38beca71cdf9000356ec56ffb390a30d (diff)
downloadruby-92f510a9d9014afdaa2f26a04ff250455ea35162.tar.gz
* array.c (rb_ary_slice_bang): should not use rb_ary_subseq()
which shares internal pointer. splice modifies the receiver right after subseq. [ruby-dev:34005] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--array.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2231b6e481..9f2c8e6bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 13 21:00:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_slice_bang): should not use rb_ary_subseq()
+ which shares internal pointer. splice modifies the receiver
+ right after subseq. [ruby-dev:34005]
+
Thu Mar 13 19:42:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc,win}32/Makefile.sub (config.h): define uint32_t.
diff --git a/array.c b/array.c
index 41a94783fb..6fa4081159 100644
--- a/array.c
+++ b/array.c
@@ -1790,7 +1790,8 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
pos = RARRAY_LEN(ary) + pos;
if (pos < 0) return Qnil;
}
- arg2 = rb_ary_subseq(ary, pos, len);
+ arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
+ RBASIC(arg2)->klass = rb_obj_class(ary);
rb_ary_splice(ary, pos, len, Qundef); /* Qnil/rb_ary_new2(0) */
return arg2;
}