diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-02 04:27:29 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-02 04:27:29 +0000 |
commit | 447578a8a02a32fc3594cf62d3c0f928fe63221a (patch) | |
tree | f4ad1d6c7b5a88b9b4332d3ee2a1863a850b31fc /string.c | |
parent | f261bdf66cb3a40b44c8830049d1ec57016777fe (diff) |
* string.c (rb_str_shared_replace): clear flags before copy.
* string.c (rb_str_replace): ditto.
* eval.c (rb_yield_0): override visibility mode for module_eval
etc. (ruby-bugs-ja PR#505)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -241,12 +241,12 @@ rb_str_shared_replace(str, str2) } RSTRING(str)->ptr = RSTRING(str2)->ptr; RSTRING(str)->len = RSTRING(str2)->len; + FL_UNSET(str, ELTS_SHARED|STR_ASSOC); if (FL_TEST(str2, ELTS_SHARED|STR_ASSOC)) { FL_SET(str, RBASIC(str2)->flags & (ELTS_SHARED|STR_ASSOC)); RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared; } else { - FL_UNSET(str, ELTS_SHARED|STR_ASSOC); RSTRING(str)->aux.capa = RSTRING(str2)->aux.capa; } RSTRING(str2)->ptr = 0; /* abandon str2 */ @@ -559,7 +559,7 @@ rb_str_resize(str, len) rb_str_modify(str); if (RSTRING(str)->len < len || RSTRING(str)->len - len > 1024) { REALLOC_N(RSTRING(str)->ptr, char, len+1); - if (!FL_TEST(str, STR_ASSOC)) { + if (!FL_TEST(str, STR_ASSOC|ELTS_SHARED)) { RSTRING(str)->aux.capa = len; } } @@ -1705,6 +1705,7 @@ rb_str_replace(str, str2) RSTRING(str)->len = RSTRING(str2)->len; RSTRING(str)->ptr = RSTRING(str2)->ptr; FL_SET(str, ELTS_SHARED); + FL_UNSET(str, STR_ASSOC); RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared; } else { |