diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-05 02:33:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-05 02:33:01 +0000 |
commit | 44e45bf1dc6c3a8eeef415e0f171d64f816a439b (patch) | |
tree | 15c3b9d7707b83aa39c8bb796386cea44df0e601 | |
parent | fcb315d1a2219ae4c2d772c414df4a29f1498434 (diff) |
* string.c (str_new4): should share shared instance if it already
exists. [ruby-dev:23665]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Jun 2 20:16:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (str_new4): should share shared instance if it already + exists. [ruby-dev:23665] + Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (rb_io_gets_m): set lastline ($_) even when read line is @@ -144,9 +144,9 @@ str_new4(klass, str) RSTRING(str2)->len = RSTRING(str)->len; RSTRING(str2)->ptr = RSTRING(str)->ptr; - if (FL_TEST(str, ELTS_SHARED) && !RSTRING(str)->aux.shared) { - /* ptr should be null_str */ + if (FL_TEST(str, ELTS_SHARED)) { FL_SET(str2, ELTS_SHARED); + RSTRING(str2)->aux.shared = RSTRING(str)->aux.shared; } else { FL_SET(str, ELTS_SHARED); @@ -166,7 +166,6 @@ rb_str_new4(orig) klass = rb_obj_class(orig); if (FL_TEST(orig, ELTS_SHARED) && (str = RSTRING(orig)->aux.shared) && klass == RBASIC(str)->klass) { long ofs; - str = RSTRING(orig)->aux.shared; ofs = RSTRING(str)->len - RSTRING(orig)->len; if (ofs > 0) { str = str_new3(klass, str); |