From e2cb0b9766537e6db2bd515339c598d3aca438d2 Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 29 Oct 2008 17:24:44 +0000 Subject: * array.c (rb_ary_sort_bang): remove SEGV when replacing array with embedded one during sort. * test/ruby/test_array.rb (test_sort!): add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 5aefe9f8c0..45eef76c1f 100644 --- a/array.c +++ b/array.c @@ -1758,10 +1758,12 @@ rb_ary_sort_bang(VALUE ary) } else { assert(!ARY_EMBED_P(tmp)); - if (ARY_EMBED_P(ary)) FL_UNSET_EMBED(ary); - if (RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { + if (ARY_EMBED_P(ary) || RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { assert(!ARY_SHARED_P(tmp)); - if (ARY_SHARED_P(ary)) { + if (ARY_EMBED_P(ary)) { + FL_UNSET_EMBED(ary); + } + else if (ARY_SHARED_P(ary)) { rb_ary_unshare(ary); } else { -- cgit v1.2.3