diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-29 14:32:18 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-29 14:32:18 +0000 |
commit | 701c70e06815d17bec02fec91327b0d12b4520b6 (patch) | |
tree | f19a86fd38a27ee4b7f988aff306a81972cab7d8 | |
parent | 2f9d0282021be64a6c0d102d2250808354059b29 (diff) | |
download | ruby-701c70e06815d17bec02fec91327b0d12b4520b6.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat May 29 23:30:33 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * string.c (str_replace_shared): change embedded state atomically. + [ruby-core:29953] [ruby-dev:41456] + Sat May 29 12:56:09 2010 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (rb_filesystem_encindex): avoid infinite require @@ -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; |