From 4adfbab35c128a0c3b9f1fdb7c0d89ccdaf55351 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 9 Oct 2014 04:35:12 +0000 Subject: array.c: fix potential memory leak * array.c (ary_new): allocate buffer in heap after new object get allocated successfully, to get rid of potential memory leak at object allocation failure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 9884092ebe..71e9b46edf 100644 --- a/array.c +++ b/array.c @@ -474,17 +474,14 @@ ary_new(VALUE klass, long capa) RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline()); } + ary = ary_alloc(klass); if (capa > RARRAY_EMBED_LEN_MAX) { ptr = ALLOC_N(VALUE, capa); - ary = ary_alloc(klass); FL_UNSET_EMBED(ary); ARY_SET_PTR(ary, ptr); ARY_SET_CAPA(ary, capa); ARY_SET_HEAP_LEN(ary, 0); } - else { - ary = ary_alloc(klass); - } return ary; } -- cgit v1.2.3