usa	2008-10-15 22:21:37 +0900 (Wed, 15 Oct 2008)

  New Revision: 19793

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19793

  Log:
    * array.c (RESIZE_CAPA): check whether len is longer than capacity.
    
    * array.c (rb_ary_compact_bang): resize ary before changing capacity.

  Modified files:
    trunk/ChangeLog
    trunk/array.c

Index: array.c
===================================================================
--- array.c	(revision 19792)
+++ array.c	(revision 19793)
@@ -125,6 +125,7 @@
 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 @@
     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;
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19792)
+++ ChangeLog	(revision 19793)
@@ -1,3 +1,9 @@
+Wed Oct 15 22:19:14 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* version.h (RUBY_DESCRIPTION): remove unnecessary space.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/