diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-09 17:40:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-09 17:40:04 +0000 |
commit | 6e06d6440bc91dff08fdd7f07181468ebb1b39b3 (patch) | |
tree | 1e72e14f0ded7cff85d36ebfb14f13f50f525d5e /gc.c | |
parent | 8789eb02ee3a50bce083fbd3f1c1c8701014c979 (diff) | |
download | ruby-6e06d6440bc91dff08fdd7f07181468ebb1b39b3.tar.gz |
fix potential memory leaks
* gc.c (rb_alloc_tmp_buffer_with_count): keep the order; allocate
an empty imemo first then xmalloc, to get rid of potential
memory leak when allocation imemo failed.
* parse.y (rb_parser_malloc, rb_parser_calloc, rb_parser_realloc):
ditto.
* process.c (rb_execarg_allocate_dup2_tmpbuf): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -8141,9 +8141,17 @@ void * rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t size, size_t cnt) { void *ptr; + VALUE imemo; + rb_imemo_tmpbuf_t *tmpbuf; + /* Keep the order; allocate an empty imemo first then xmalloc, to + * get rid of potential memory leak */ + imemo = rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(NULL, 0); + *store = imemo; ptr = ruby_xmalloc0(size); - *store = rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(ptr, cnt); + tmpbuf = (rb_imemo_tmpbuf_t *)imemo; + tmpbuf->ptr = ptr; + tmpbuf->cnt = cnt; return ptr; } |