From 55dbc2c51a407c3ee2be270feb3b072a02fe81bf Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 5 Jul 2015 01:51:51 +0000
Subject: array.c: fix memory leak

* array.c (rb_ary_sort_bang): the original array may not be
  embedded even if a substitution array is embedded, as it is
  embedded when the original array is short enough but not
  embedded.  [ruby-dev:49166] [Bug #11332]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index 5953dfcaf8..132528d2e1 100644
--- a/array.c
+++ b/array.c
@@ -2479,8 +2479,8 @@ rb_ary_sort_bang(VALUE ary)
         if (ARY_EMBED_P(tmp)) {
             if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
                 rb_ary_unshare(ary);
+		FL_SET_EMBED(ary);
             }
-            FL_SET_EMBED(ary);
 	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
-- 
cgit v1.2.3