From c39e8c6e854032645b0f2b799294d3e96d066697 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 16 May 2008 18:27:01 +0000 Subject: * array.c (rb_ary_sort_bang): stop memory leak. [ruby-dev:34726] * re.c (rb_reg_search): need to free allocated buffer in re_register. * regexec.c (onig_region_new): more pedantic malloc check. * regexec.c (onig_region_resize): ditto. * regexec.c (STATE_CHECK_BUFF_INIT): ditto. * regexec.c (onig_region_copy): use onig_region_resize. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 631080d521..635c7c7837 100644 --- a/array.c +++ b/array.c @@ -1513,16 +1513,17 @@ 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; + if (RARRAY(ary)->ptr != RARRAY(tmp)->ptr) { + 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_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; } -- cgit v1.2.3