* array.c (rb_ary_initialize): should call rb_ary_modify() first.

shyouhei · shyouhei · commit 243c8f8b1d8c · 2007-08-15T19:39:42.000Z
[ruby-core:11562]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 04:39:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
+	  [ruby-core:11562]
+
 Thu Aug 16 04:38:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (yylex): return non-valid token for an invalid
diff --git a/array.c b/array.c
@@ -272,6 +272,7 @@ rb_ary_initialize(argc, argv, ary)
     long len;
     VALUE size, val;
 
+    rb_ary_modify(ary);
     if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
 	RARRAY(ary)->len = 0;
 	if (rb_block_given_p()) {
@@ -295,7 +296,6 @@ rb_ary_initialize(argc, argv, ary)
     if (len > 0 && len * (long)sizeof(VALUE) <= len) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    rb_ary_modify(ary);
     if (len > RARRAY(ary)->aux.capa) {
 	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
 	RARRAY(ary)->aux.capa = len;
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-16"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 63
+#define RUBY_PATCHLEVEL 64
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
