diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 17:24:44 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 17:24:44 +0000 |
commit | e2cb0b9766537e6db2bd515339c598d3aca438d2 (patch) | |
tree | dea1dc005b8cb262527fbf46017267594011512e /array.c | |
parent | 143f059bcd84284b54445d237ad202f1cb3e639a (diff) | |
download | ruby-e2cb0b9766537e6db2bd515339c598d3aca438d2.tar.gz |
* 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
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 { |