From 7915aed8752566f355ab4b19216da96836fd9589 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 11 Jun 2009 17:41:27 +0000 Subject: * string.c (str_replace_shared): shared target must be frozen. [ruby-core:23727] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 58d510fe3b..c9621d399d 100644 --- a/string.c +++ b/string.c @@ -14,6 +14,7 @@ #include "ruby/ruby.h" #include "ruby/re.h" #include "ruby/encoding.h" +#include #define BEG(no) regs->beg[no] #define END(no) regs->end[no] @@ -599,6 +600,7 @@ str_replace_shared(VALUE str2, VALUE str) } else { FL_SET(str2, STR_NOEMBED); + str = rb_str_new_frozen(str); RSTRING(str2)->as.heap.len = RSTRING_LEN(str); RSTRING(str2)->as.heap.ptr = RSTRING_PTR(str); RSTRING(str2)->as.heap.aux.shared = str; @@ -643,8 +645,10 @@ str_new4(VALUE klass, VALUE str) RSTRING(str2)->as.heap.len = RSTRING_LEN(str); RSTRING(str2)->as.heap.ptr = RSTRING_PTR(str); if (STR_SHARED_P(str)) { + VALUE shared = RSTRING(str)->as.heap.aux.shared; + assert(OBJ_FROZEN(shared)); FL_SET(str2, ELTS_SHARED); - RSTRING(str2)->as.heap.aux.shared = RSTRING(str)->as.heap.aux.shared; + RSTRING(str2)->as.heap.aux.shared = shared; } else { FL_SET(str, ELTS_SHARED); @@ -664,6 +668,7 @@ rb_str_new_frozen(VALUE orig) klass = rb_obj_class(orig); if (STR_SHARED_P(orig) && (str = RSTRING(orig)->as.heap.aux.shared)) { long ofs; + assert(OBJ_FROZEN(str)); ofs = RSTRING_LEN(str) - RSTRING_LEN(orig); if ((ofs > 0) || (klass != RBASIC(str)->klass) || (!OBJ_TAINTED(str) && OBJ_TAINTED(orig))) { @@ -824,12 +829,14 @@ str_replace(VALUE str, VALUE str2) str2 = rb_str_new4(str2); } if (STR_SHARED_P(str2)) { + VALUE shared = RSTRING(str2)->as.heap.aux.shared; + assert(OBJ_FROZEN(shared)); STR_SET_NOEMBED(str); RSTRING(str)->as.heap.len = len; RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2); FL_SET(str, ELTS_SHARED); FL_UNSET(str, STR_ASSOC); - RSTRING(str)->as.heap.aux.shared = RSTRING(str2)->as.heap.aux.shared; + RSTRING(str)->as.heap.aux.shared = shared; } else { str_replace_shared(str, str2); -- cgit v1.2.3