summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-18 11:50:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-18 11:50:49 +0000
commitf8c8a38d30f6e23211f7ab1ca11b84d1ab85972f (patch)
tree2c90c27edbbba2415edb1817252c0fb05177a58b
parentf4b8bbb143c952e5dc6887fbf51af87d96c00d97 (diff)
* string.c (rb_str_dup_frozen): handle tail shared string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a3ef0141d..794314b996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
-Wed Dec 18 02:27:34 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+Wed Dec 18 03:52:55 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* string.c (rb_str_new4): handle tail shared string.
(ruby-bugs-ja:PR#370)
+ * string.c (rb_str_dup_frozen): ditto.
+
Tue Dec 17 21:08:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* node.h (NODE_ATTRASGN): new node, assignment to attribute.
diff --git a/string.c b/string.c
index 01316b9c23..26d1cbf2af 100644
--- a/string.c
+++ b/string.c
@@ -517,8 +517,11 @@ rb_str_dup_frozen(str)
VALUE str;
{
if (FL_TEST(str, ELTS_SHARED)) {
- OBJ_FREEZE(RSTRING(str)->aux.shared);
- return RSTRING(str)->aux.shared;
+ VALUE shared = RSTRING(str)->aux.shared;
+ if (RSTRING(shared)->len == RSTRING(str)->len) {
+ OBJ_FREEZE(shared);
+ return shared;
+ }
}
if (OBJ_FROZEN(str)) return str;
str = rb_str_dup(str);