nobu	2009-02-15 00:39:46 +0900 (Sun, 15 Feb 2009)

  New Revision: 22306

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

  Log:
    * array.c (ary_resize_capa): should not overwrite outside embedded
      array.

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/version.h

Index: array.c
===================================================================
--- array.c	(revision 22305)
+++ array.c	(revision 22306)
@@ -163,7 +163,8 @@
     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); 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22305)
+++ ChangeLog	(revision 22306)
@@ -1,3 +1,8 @@
+Sun Feb 15 00:39:44 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (ary_resize_capa): should not overwrite outside embedded
+	  array.
+
 Sat Feb 14 20:18:19 2009  Tanaka Akira  <akr@f...>
 
 	* test/test_time.rb: extracted from lib/time.rb.
Index: version.h
===================================================================
--- version.h	(revision 22305)
+++ version.h	(revision 22306)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-02-14"
+#define RUBY_RELEASE_DATE "2009-02-15"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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