summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--array.c3
2 files changed, 11 insertions, 1 deletions
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 <usa@ruby-lang.org>
+
+ * 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 <nobu@ruby-lang.org>
* 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);
}