aboutsummaryrefslogtreecommitdiffstats
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-03 04:52:13 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-03 04:52:13 +0000
commit040ce056101bc9a8d9a5b0ed5d6a5835ec31be26 (patch)
tree82fd70a465e7b4ff794d2bfd9806fb6ed29ebbeb /string.c
parente14c9f10489759a601fbdfd2af41909c6fe54c1b (diff)
downloadruby-040ce056101bc9a8d9a5b0ed5d6a5835ec31be26.tar.gz
* 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/trunk@53724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/string.c b/string.c
index 7af14c8ef2..b6de5f2b1b 100644
--- a/string.c
+++ b/string.c
@@ -1090,6 +1090,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);