From c33e46e1e0801ea3625bf84e56410f0f273306d7 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 24 Jul 2015 12:27:32 +0000 Subject: string.c: fstring must not be a shared string * string.c (fstr_update_callback): fstring must not be a shared string, or the content without RSTRING_FSTR may be freed. [ruby-dev:49188] [Bug #11386] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03b3467328..010902f131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 24 21:27:29 2015 Nobuyoshi Nakada + + * string.c (fstr_update_callback): fstring must not be a shared + string, or the content without RSTRING_FSTR may be freed. + [ruby-dev:49188] [Bug #11386] + Fri Jul 24 20:09:43 2015 Naohisa Goto * test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6): prevent to use diff --git a/string.c b/string.c index 4e02916fda..48a9f49521 100644 --- a/string.c +++ b/string.c @@ -266,8 +266,7 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi assert(OBJ_FROZEN(str)); } if (!BARE_STRING_P(str)) { - str = str_new_shared(rb_cString, str); - OBJ_FREEZE_RAW(str); + str = str_new_frozen(rb_cString, str); } } RBASIC(str)->flags |= RSTRING_FSTR; @@ -1002,9 +1001,13 @@ rb_str_new_shared(VALUE str) VALUE rb_str_new_frozen(VALUE orig) { + VALUE str; + if (OBJ_FROZEN(orig)) return orig; - return str_new_frozen(rb_obj_class(orig), orig); + str = str_new_frozen(rb_obj_class(orig), orig); + OBJ_INFECT(str, orig); + return str; } static VALUE @@ -1048,7 +1051,6 @@ str_new_frozen(VALUE klass, VALUE orig) } rb_enc_cr_str_exact_copy(str, orig); - OBJ_INFECT(str, orig); OBJ_FREEZE(str); return str; } -- cgit v1.2.3