diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | array.c | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Thu May 8 15:14:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * array.c (rb_ary_sort_bang): freeze temporary array. + Thu May 8 13:19:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm.c (rb_thread_mark): mark stat_insn_usage only when ptr is not @@ -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; } |