summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-18 13:57:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-18 13:57:43 +0000
commit0da431e384f8aeef9504b6839702165d9f5bcd3d (patch)
tree42105b7a2fd76326762d4a9dbf50d1bd31df0d95
parent6550126fabd3ee9a7d9983bf1e03fad4614ccbe0 (diff)
downloadruby-0da431e384f8aeef9504b6839702165d9f5bcd3d.tar.gz
ruby-0da431e384f8aeef9504b6839702165d9f5bcd3d.tar.xz
ruby-0da431e384f8aeef9504b6839702165d9f5bcd3d.zip
* array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--array.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e87fd2f..021556f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 18 22:56:51 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
+
Wed Oct 18 13:25:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_each_line): String#lines now works when a block
diff --git a/array.c b/array.c
index 458310a69..bfaf85e85 100644
--- a/array.c
+++ b/array.c
@@ -618,7 +618,7 @@ rb_ary_shift(VALUE ary)
if (RARRAY_LEN(ary) == 0) return Qnil;
top = RARRAY_PTR(ary)[0];
if (ARY_EMBED_P(ary)) {
- MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary));
+ MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)-1);
return top;
}