diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2018-04-25 15:59:56 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-25 15:59:56 +0900 |
| commit | 1c66d42e47dee04974ea83503d552d47caa5c480 (patch) | |
| tree | 21954ce88a314885c6163dc03b7986118e095942 | |
| parent | 8bfad558f8eee97b3fcfe2afab3cc84ddb1d15b3 (diff) | |
| parent | e66c99023491107e3d0281af524434f4728e5f74 (diff) | |
| download | mruby-1c66d42e47dee04974ea83503d552d47caa5c480.tar.gz mruby-1c66d42e47dee04974ea83503d552d47caa5c480.zip | |
Merge pull request #4010 from take-cheeze/fix_ary_replace_leak
Fix array replace leak error in mruby-uri.
| -rw-r--r-- | src/array.c | 3 | ||||
| -rw-r--r-- | test/t/array.rb | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/array.c b/src/array.c index bfa6e5f06..2152e292d 100644 --- a/src/array.c +++ b/src/array.c @@ -377,6 +377,9 @@ ary_replace(mrb_state *mrb, struct RArray *a, struct RArray *b) if (ARY_EMBED_P(a)) { ARY_UNSET_EMBED_FLAG(a); } + else { + mrb_free(mrb, a->as.heap.ptr); + } a->as.heap.ptr = b->as.heap.ptr; a->as.heap.len = len; a->as.heap.aux.shared = b->as.heap.aux.shared; diff --git a/test/t/array.rb b/test/t/array.rb index d2edd0189..ecec39363 100644 --- a/test/t/array.rb +++ b/test/t/array.rb @@ -392,3 +392,10 @@ assert('Array#freeze') do a[0] = 1 end end + +assert('shared array replace') do + a = [0] * 40 + b = [0, 1, 2] + b.replace a[1, 20].dup + assert_equal 20, b.size +end |