diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:40:50 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:40:50 +0000 |
commit | 03a7970e953df23ce4b6c4debb5e2cfe1182dc21 (patch) | |
tree | 2adda30694c4ca760693d991cb70f608183b67f3 /array.c | |
parent | b70f6464e0d5c120610dd2b107c78436b219147d (diff) |
merges r30736,r30738 and r30739 from trunk into ruby_1_9_2.
--
* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
rb_resize_capa because rb_resize_capa expects resized length is
smaller than current array length. call rb_ary_unshare before
rb_resize_capa because rb_resize_capa losts the reference to
original shared array.
--
Add ML Reference and a test for r30736 [ruby-core:34997]
--
Additional fix for r30736
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -3430,8 +3430,12 @@ rb_ary_uniq_bang(VALUE ary) if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) { return Qnil; } - ary_resize_capa(ary, i); ARY_SET_LEN(ary, 0); + if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { + rb_ary_unshare(ary); + FL_SET_EMBED(ary); + } + ary_resize_capa(ary, i); st_foreach(RHASH_TBL(hash), push_value, ary); } else { |