summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-04 10:37:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-04 10:37:05 +0000
commit36044b07730033911580501cbe1a060e820e927e (patch)
tree97a1e69b0f3be020dc84440566ec754e212a8f3f
parent99d96a89ce57edc4de2ff1acb1d4ed7737144140 (diff)
* string.c (rb_str_set_len): rb_str_modify cannot work before the
length is set, which is a precondition for rb_str_modify. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ce180eb..94ad482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 4 19:37:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_set_len): rb_str_modify cannot work before the
+ length is set, which is a precondition for rb_str_modify.
+
Wed Aug 4 16:09:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_resize): should copy the content properly. a
diff --git a/string.c b/string.c
index 6d8b606..decc9d7 100644
--- a/string.c
+++ b/string.c
@@ -1692,7 +1692,7 @@ rb_str_unlocktmp(VALUE str)
void
rb_str_set_len(VALUE str, long len)
{
- rb_str_modify(str);
+ str_modifiable(str);
STR_SET_LEN(str, len);
RSTRING_PTR(str)[len] = '\0';
}