From 701c70e06815d17bec02fec91327b0d12b4520b6 Mon Sep 17 00:00:00 2001 From: mame Date: Sat, 29 May 2010 14:32:18 +0000 Subject: [PATCH] * string.c (str_replace_shared): change embedded state atomically. [ruby-core:29953] [ruby-dev:41456] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5788cbe039..4218952d77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 29 23:30:33 2010 Yusuke Endoh + + * string.c (str_replace_shared): change embedded state atomically. + [ruby-core:29953] [ruby-dev:41456] + Sat May 29 12:56:09 2010 NARUSE, Yui * encoding.c (rb_filesystem_encindex): avoid infinite require diff --git a/string.c b/string.c index f2f49abaff..ae4289380f 100644 --- a/string.c +++ b/string.c @@ -613,8 +613,8 @@ str_replace_shared(VALUE str2, VALUE str) STR_SET_EMBED_LEN(str2, RSTRING_LEN(str)); } else { - FL_SET(str2, STR_NOEMBED); str = rb_str_new_frozen(str); + FL_SET(str2, STR_NOEMBED); RSTRING(str2)->as.heap.len = RSTRING_LEN(str); RSTRING(str2)->as.heap.ptr = RSTRING_PTR(str); RSTRING(str2)->as.heap.aux.shared = str;