From a2ed2d20cb69da4c0c0258f04d704a370cf02d84 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 16:30:10 +0000
Subject: merge revision(s) 53724: [Backport #11946]

	* string.c (str_new_frozen): if the given string is embeddedable
	  but not embedded, embed a new copied string. [Bug #11946]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'string.c')

diff --git a/string.c b/string.c
index 5bb60593e3..5625c2bd88 100644
--- a/string.c
+++ b/string.c
@@ -1087,6 +1087,13 @@ str_new_frozen(VALUE klass, VALUE orig)
 		return shared;
 	    }
 	}
+	else if (RSTRING_LEN(orig)+TERM_LEN(orig) <= RSTRING_EMBED_LEN_MAX+1) {
+	    str = str_alloc(klass);
+	    STR_SET_EMBED(str);
+	    memcpy(RSTRING_PTR(str), RSTRING_PTR(orig), RSTRING_LEN(orig));
+	    STR_SET_EMBED_LEN(str, RSTRING_LEN(orig));
+	    TERM_FILL(RSTRING_END(str), TERM_LEN(orig));
+	}
 	else {
 	    str = str_alloc(klass);
 	    STR_SET_NOEMBED(str);
-- 
cgit v1.2.3