summaryrefslogtreecommitdiffstats
path: root/array.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-08 06:14:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-08 06:14:36 +0000
commitc32212d63e1f9d74f0a0c7cac7cbc8d150a12345 (patch)
tree1c7c1955779a99646ce16dc44cf4de77e46a04e1 /array.c
parentd7f53ecbb3aadca06ba0a0788b453bb897abb79c (diff)
downloadruby-c32212d63e1f9d74f0a0c7cac7cbc8d150a12345.tar.gz
ruby-c32212d63e1f9d74f0a0c7cac7cbc8d150a12345.tar.xz
ruby-c32212d63e1f9d74f0a0c7cac7cbc8d150a12345.zip
* array.c (rb_ary_sort_bang): freeze temporary array.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/array.c b/array.c
index 9df29447f..9fe0fc9c1 100644
--- a/array.c
+++ b/array.c
@@ -1513,13 +1513,16 @@ rb_ary_sort_bang(VALUE ary)
RBASIC(tmp)->klass = 0;
ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
rb_block_given_p()?sort_1:sort_2, &RBASIC(tmp)->klass);
+ sort_reentered(&RBASIC(tmp)->klass);
RARRAY(ary)->ptr = RARRAY(tmp)->ptr;
RARRAY(ary)->len = RARRAY(tmp)->len;
RARRAY(ary)->aux.capa = RARRAY(tmp)->aux.capa;
FL_UNSET(ary, ELTS_SHARED);
RARRAY(tmp)->ptr = 0;
RARRAY(tmp)->len = 0;
+ RARRAY(tmp)->aux.capa = 0;
RBASIC(tmp)->klass = RBASIC(ary)->klass;
+ OBJ_FREEZE(tmp);
}
return ary;
}