summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-12 14:16:43 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-12 14:16:43 +0000
commitb9140136e0904974602c37d8ec5ea69bedc4e968 (patch)
treea4cb8df01a4fc2f06de47b32bc8c198ed799a1be
parent3435a344ec427a4558c4828e8fe3f92d6413fb1a (diff)
downloadruby-b9140136e0904974602c37d8ec5ea69bedc4e968.tar.gz
ruby-b9140136e0904974602c37d8ec5ea69bedc4e968.tar.xz
ruby-b9140136e0904974602c37d8ec5ea69bedc4e968.zip
* string.c (rb_str_splice_0): call rb_str_drop_bytes, not rb_str_drop.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c77c0f768..4208375ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 12 23:16:09 2008 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_splice_0): call rb_str_drop_bytes, not rb_str_drop.
+
Tue Aug 12 19:11:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/make-snapshot: fix for enc.mk.
diff --git a/string.c b/string.c
index 6742e04a1..d71425d1a 100644
--- a/string.c
+++ b/string.c
@@ -2861,7 +2861,7 @@ static void
rb_str_splice_0(VALUE str, long beg, long len, VALUE val)
{
if (beg == 0 && RSTRING_LEN(val) == 0) {
- rb_str_drop(str, len);
+ rb_str_drop_bytes(str, len);
OBJ_INFECT(str, val);
return;
}