diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 19:52:07 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 19:52:07 +0000 |
| commit | 20ef4699e510f89ad4e9ccbeafa2d3d725ed2d3c (patch) | |
| tree | 15e5db410c7d991bbe3ff93795ecf8fac167b7c3 /string.c | |
| parent | ddf1f59df5fbff6c659177bc36e161b2ae285d5f (diff) | |
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
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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;\ |