* array.c (RESIZE_CAPA): check whether len is longer than capacity.

	* array.c (rb_ary_compact_bang): resize ary before changing capacity.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 241a18d69..992e6e7c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 15 22:19:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (RESIZE_CAPA): check whether len is longer than capacity.
+
+	* array.c (rb_ary_compact_bang): resize ary before changing capacity.
+
 Wed Oct 15 16:57:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* version.h (RUBY_DESCRIPTION): remove unnecessary space.
diff --git a/array.c b/array.c
index 4aa6dbef0..da513f96a 100644
--- a/array.c
+++ b/array.c
@@ -125,6 +125,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
 static void
 RESIZE_CAPA(VALUE ary, long capacity)
 {
+    assert(RARRAY_LEN(ary) <= capacity);
     assert(!OBJ_FROZEN(ary)); 
     assert(!ARY_SHARED_P(ary)); 
     if (capacity > RARRAY_EMBED_LEN_MAX) {
@@ -2927,10 +2928,10 @@ rb_ary_compact_bang(VALUE ary)
     if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
+    ARY_SET_LEN(ary, n);
     if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
 	RESIZE_CAPA(ary, n * 2);
     }
-    ARY_SET_LEN(ary, n);
 
     return ary;
 }