From 9afd5465e216f4795bf952a072aae5b315a66d8d Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 May 2008 05:01:52 +0000 Subject: * array.c (rb_ary_sort_bang): should not free shared pointer, and set shared. [ruby-dev:34732] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index 635c7c7837..6fd7a75e01 100644 --- a/array.c +++ b/array.c @@ -1514,10 +1514,11 @@ rb_ary_sort_bang(VALUE ary) ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE), rb_block_given_p()?sort_1:sort_2, &RBASIC(tmp)->klass); if (RARRAY(ary)->ptr != RARRAY(tmp)->ptr) { - xfree(RARRAY(ary)->ptr); + if (!ARY_SHARED_P(ary)) xfree(RARRAY(ary)->ptr); RARRAY(ary)->ptr = RARRAY(tmp)->ptr; RARRAY(ary)->len = RARRAY(tmp)->len; RARRAY(ary)->aux.capa = RARRAY(tmp)->aux.capa; + FL_SET(ary, ELTS_SHARED); }; FL_UNSET(ary, ELTS_SHARED); RARRAY(tmp)->ptr = 0; -- cgit v1.2.3