diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Dec 30 16:44:14 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * string.c (rb_str_substr): should share the shared string if + present, instead of the original string. (ruby-bugs:PR#528) + Mon Dec 30 05:10:00 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> * ext/socket/socket.c (tcp_svr_init): local host to @@ -500,9 +500,12 @@ rb_str_substr(str, beg, len) if (len > sizeof(struct RString)/2 && beg + len == RSTRING(str)->len && !FL_TEST(str, STR_ASSOC)) { - if (!FL_TEST(str, ELTS_SHARED)) str = str_new4(CLASS_OF(str), str); + if (FL_TEST(str, ELTS_SHARED)) + str = RSTRING(str)->aux.shared; + else + str = str_new4(CLASS_OF(str), str); str2 = rb_str_new3(str); - RSTRING(str2)->ptr += beg; + RSTRING(str2)->ptr += RSTRING(str2)->len - len; RSTRING(str2)->len = len; } else { |