diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-16 18:27:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-16 18:27:01 +0000 |
commit | c39e8c6e854032645b0f2b799294d3e96d066697 (patch) | |
tree | 120d6b709a600ca8bac3a190ad92f996a4e25e68 /array.c | |
parent | 03ed3bde9af8fab61476f506eab146d9e387c38b (diff) | |
download | ruby-c39e8c6e854032645b0f2b799294d3e96d066697.tar.gz |
* 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
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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; } |