From 20ef4699e510f89ad4e9ccbeafa2d3d725ed2d3c Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 19 May 2015 19:52:07 +0000 Subject: merge revision(s) 50334,50337: [Backport #10942] * string.c (STR_SET_EMBED): clear NOFREE flag at embedding as embedded strings no longer refer static strings. [ruby-core:68436] [Bug #10942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index 2652b291a5..1753b37bdc 100644 --- a/string.c +++ b/string.c @@ -60,7 +60,7 @@ VALUE rb_cSymbol; FL_SET((str), STR_NOEMBED);\ STR_SET_EMBED_LEN((str), 0);\ } while (0) -#define STR_SET_EMBED(str) FL_UNSET((str), STR_NOEMBED) +#define STR_SET_EMBED(str) FL_UNSET((str), (STR_NOEMBED|STR_NOFREE)) #define STR_SET_EMBED_LEN(str, n) do { \ long tmp_n = (n);\ RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\ -- cgit v1.2.3