From bd53818999f882e7509c797b7a9be4decef42c81 Mon Sep 17 00:00:00 2001 From: ksss Date: Wed, 11 Jun 2014 14:42:18 +0000 Subject: str_replace: self should not be shared and nofree --- src/string.c | 18 +++++++++++------- test/t/string.rb | 7 +++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/string.c b/src/string.c index 6d2799270..56fdf7b4c 100644 --- a/src/string.c +++ b/src/string.c @@ -1368,14 +1368,17 @@ str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2) long len; len = RSTR_LEN(s2); + if (RSTR_SHARED_P(s1)) { + str_decref(mrb, s1->as.heap.aux.shared); + } + else if (!RSTR_EMBED_P(s1) && !RSTR_NOFREE_P(s1)) { + mrb_free(mrb, s1->as.heap.ptr); + } + + RSTR_UNSET_NOFREE_FLAG(s1); + if (RSTR_SHARED_P(s2)) { - L_SHARE: - if (RSTR_SHARED_P(s1)) { - str_decref(mrb, s1->as.heap.aux.shared); - } - else if (!RSTR_EMBED_P(s1) && !RSTR_NOFREE_P(s1)) { - mrb_free(mrb, s1->as.heap.ptr); - } +L_SHARE: RSTR_UNSET_EMBED_FLAG(s1); s1->as.heap.ptr = s2->as.heap.ptr; s1->as.heap.len = len; @@ -1385,6 +1388,7 @@ str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2) } else { if (len <= RSTRING_EMBED_LEN_MAX) { + RSTR_UNSET_SHARED_FLAG(s1); RSTR_SET_EMBED_FLAG(s1); memcpy(s1->as.ary, RSTR_PTR(s2), len); RSTR_SET_EMBED_LEN(s1, len); diff --git a/test/t/string.rb b/test/t/string.rb index 5ecb51530..00e98f671 100644 --- a/test/t/string.rb +++ b/test/t/string.rb @@ -320,6 +320,13 @@ assert('String#replace', '15.2.10.5.28') do b.replace(c); c.replace(b); assert_equal c, b + + # shared string + s = "foo" * 100 + a = s[10, 90] # create shared string + assert_equal("", s.replace("")) # clear + assert_equal("", s) # s is cleared + assert_not_equal("", a) # a should not be affected end assert('String#reverse', '15.2.10.5.29') do -- cgit v1.2.3