From 03a7970e953df23ce4b6c4debb5e2cfe1182dc21 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 28 Mar 2011 13:40:50 +0000 Subject: 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 --- array.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index 6640a1af28..60f3f5646b 100644 --- a/array.c +++ b/array.c @@ -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 { -- cgit v1.2.3