summaryrefslogtreecommitdiffstats
path: root/array.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-14 15:39:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-14 15:39:46 +0000
commit6c9fb8afc188bd8999435be55dd7aecb8d6b374a (patch)
tree689ae31d573520360c9d957056883e5d611d1f50 /array.c
parent5fda10dd09e285e2a0ee189158f91e3100080950 (diff)
downloadruby-6c9fb8afc188bd8999435be55dd7aecb8d6b374a.tar.gz
ruby-6c9fb8afc188bd8999435be55dd7aecb8d6b374a.tar.xz
ruby-6c9fb8afc188bd8999435be55dd7aecb8d6b374a.zip
* array.c (ary_resize_capa): should not overwrite outside embedded
array. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/array.c b/array.c
index 35023f320..5a6ceebea 100644
--- a/array.c
+++ b/array.c
@@ -163,7 +163,8 @@ ary_resize_capa(VALUE ary, long capacity)
else {
if (!ARY_EMBED_P(ary)) {
long len = RARRAY_LEN(ary);
- VALUE *ptr = RARRAY_PTR(ary);
+ VALUE *ptr = RARRAY_PTR(ary);
+ if (len > capacity) len = capacity;
MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
FL_SET_EMBED(ary);
ARY_SET_LEN(ary, len);