summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-15 08:35:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-15 08:35:35 +0000
commit62e5fa173788a443ad230eb379905515cad04a87 (patch)
tree8d4906d6ffc0195205010ce95b857202c1132c59 /array.c
parentf4a0a7317566bba66b8ea59df99b4b59b3d35d5c (diff)
* array.c (rb_ary_shift, rb_ary_shift_m): clears unused elements.
[ruby-dev:38448] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/array.c b/array.c
index 1f462f7899..1696171051 100644
--- a/array.c
+++ b/array.c
@@ -807,6 +807,9 @@ rb_ary_shift(VALUE ary)
RARRAY_PTR(ary)[0] = Qnil;
ary_make_shared(ary);
}
+ else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
+ RARRAY_PTR(ary)[0] = Qnil;
+ }
ARY_INCREASE_PTR(ary, 1); /* shift ptr */
ARY_INCREASE_LEN(ary, -1);
@@ -848,6 +851,9 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
n = RARRAY_LEN(result);
if (ARY_SHARED_P(ary)) {
+ if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
+ rb_mem_clear(RARRAY_PTR(ary), n);
+ }
ARY_INCREASE_PTR(ary, n);
}
else {