diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 14:30:07 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 14:30:07 +0000 |
| commit | 64cd55b095cb8634ea03602adf201e0406e3462f (patch) | |
| tree | 1367df977e1bc1d8520342642c42c550119f2dbf /array.c | |
| parent | a44a7de55bb1baf38a2fa793421f61c338fd0917 (diff) | |
| download | ruby-64cd55b095cb8634ea03602adf201e0406e3462f.tar.gz ruby-64cd55b095cb8634ea03602adf201e0406e3462f.tar.xz ruby-64cd55b095cb8634ea03602adf201e0406e3462f.zip | |
* array.c (rb_ary_sort_bang): replacing array during sort broke
invariant of array.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1751,14 +1751,18 @@ rb_ary_sort_bang(VALUE ary) ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE), rb_block_given_p()?sort_1:sort_2, &data); - if (ARY_EMBED_P(ary) || ARY_EMBED_P(tmp)) { + if (ARY_EMBED_P(tmp)) { assert(ARY_EMBED_P(tmp)); + if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ + rb_ary_unshared(ary); + FL_SET_EMBED(ary); + } MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp)); ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp)); } else { - assert(!ARY_EMBED_P(ary)); assert(!ARY_EMBED_P(tmp)); + if (ARY_EMBED_P(ary)) FL_UNSET_EMBED(ary); if (RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { assert(!ARY_SHARED_P(tmp)); if (ARY_SHARED_P(ary)) { |