1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak

Browse Source 
* array.c (flatten): fix a memory leak in the case of an exception
  at conversion of an element to Array.
This commit is contained in:
Nobuyoshi Nakada 2019-09-20 10:29:24 +09:00
parent 45bac62845
commit 422ae594d9
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
array.c
View File

@ -5119,13 +5119,16 @@ static VALUE
flatten(VALUE ary, int level, int *modified) flatten(VALUE ary, int level, int *modified)
{ {
long i = 0; long i = 0;
VALUE stack, result, tmp, elt; VALUE stack, result, tmp, elt, vmemo;
st_table *memo; st_table *memo;
st_data_t id; st_data_t id;
stack = ary_new(0, ARY_DEFAULT_SIZE); stack = ary_new(0, ARY_DEFAULT_SIZE);
result = ary_new(0, RARRAY_LEN(ary)); result = ary_new(0, RARRAY_LEN(ary));
vmemo = rb_hash_new();
RBASIC_CLEAR_CLASS(vmemo);
memo = st_init_numtable(); memo = st_init_numtable();
rb_hash_st_table_set(vmemo, memo);
st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue); st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
*modified = 0; *modified = 0;
@ -5138,6 +5141,8 @@ flatten(VALUE ary, int level, int *modified)
} }
tmp = rb_check_array_type(elt); tmp = rb_check_array_type(elt);
if (RBASIC(result)->klass) { if (RBASIC(result)->klass) {
RB_GC_GUARD(vmemo);
st_clear(memo);
rb_raise(rb_eRuntimeError, "flatten reentered"); rb_raise(rb_eRuntimeError, "flatten reentered");
} }
if (NIL_P(tmp)) { if (NIL_P(tmp)) {
@ -5147,7 +5152,7 @@ flatten(VALUE ary, int level, int *modified)
*modified = 1; *modified = 1;
id = (st_data_t)tmp; id = (st_data_t)tmp;
if (st_lookup(memo, id, 0)) { if (st_lookup(memo, id, 0)) {
st_free_table(memo); st_clear(memo);
rb_raise(rb_eArgError, "tried to flatten recursive array"); rb_raise(rb_eArgError, "tried to flatten recursive array");
} }
st_insert(memo, id, (st_data_t)Qtrue); st_insert(memo, id, (st_data_t)Qtrue);
@ -5167,7 +5172,7 @@ flatten(VALUE ary, int level, int *modified)
ary = rb_ary_pop(stack); ary = rb_ary_pop(stack);
} }
st_free_table(memo); st_clear(memo);
RBASIC_SET_CLASS(result, rb_obj_class(ary)); RBASIC_SET_CLASS(result, rb_obj_class(ary));
return result; return result;