From c480ca0f131a5f87b8c49b8bf6af3684a13b2e84 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 11 Jan 2011 04:09:02 +0000 Subject: [PATCH] * array.c (rb_ary_resize): should care of embeded array when extending the array. * array.c (rb_ary_resize): need to set capa when changing the real size of the array. these are latent bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ array.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ccf249ff89..bf56842f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jan 11 13:06:38 2011 NAKAMURA Usaku + + * array.c (rb_ary_resize): should care of embeded array when extending + the array. + + * array.c (rb_ary_resize): need to set capa when changing the real + size of the array. + these are latent bugs. + Mon Jan 10 22:46:43 2011 Nobuyoshi Nakada * include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case diff --git a/array.c b/array.c index 43cc910cdc..c86562e5dc 100644 --- a/array.c +++ b/array.c @@ -1332,7 +1332,7 @@ rb_ary_resize(VALUE ary, long len) ary_double_capa(ary, len); } rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen); - ARY_SET_HEAP_LEN(ary, len); + ARY_SET_LEN(ary, len); } else if (ARY_EMBED_P(ary)) { ARY_SET_EMBED_LEN(ary, len); @@ -1347,6 +1347,7 @@ rb_ary_resize(VALUE ary, long len) else { if (olen > len + ARY_DEFAULT_SIZE) { REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len); + ARY_SET_CAPA(ary, len); } ARY_SET_HEAP_LEN(ary, len); }