summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:13 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:13 (GMT)
commit8bab3cc7c7296b1d8fae1c48f2603b9b024001e9 (patch)
treeffef092a174121f2d544daab444b95d5affbf462
parentd4220e5b0e5f940170f309cfdb9b436f811fee26 (diff)
parent234ed34a8295fc8c1011e690bcac63667344df9c (diff)
sorry. I made wrong tags.v1_8_5_63
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_63@13001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c2
-rw-r--r--version.h2
3 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7344ddb..c1973f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-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
index a67e923..d456373 100644
--- a/array.c
+++ b/array.c
@@ -272,7 +272,6 @@ 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()) {
@@ -296,6 +295,7 @@ 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
index a7e5971..3a06c0c 100644
--- 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 64
+#define RUBY_PATCHLEVEL 63
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8