aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-10 07:23:36 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-10 07:23:36 +0000
commitf8ba9a1f605b264069591664eae866b643c74db4 (patch)
tree5c727ad8b3d414e525ed592edc72e7d58d5090b1
parentdd96561f76f8c3ae7d60f5ace40ce32f4f1d73c8 (diff)
downloadruby-f8ba9a1f605b264069591664eae866b643c74db4.tar.gz
* array.c (rb_ary_new_from_values): add assertion
(ary should be young object). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 461d21fe26..2c353a8a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 10 16:22:50 2013 Koichi Sasada <ko1@atdot.net>
+
+ * array.c (rb_ary_new_from_values): add assertion
+ (ary should be young object).
+
Mon Jun 10 16:05:59 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (wmap_mark): check allocation of `w->obj2wmap'.
diff --git a/array.c b/array.c
index 345a60bfc6..7f423ed3bb 100644
--- a/array.c
+++ b/array.c
@@ -456,6 +456,7 @@ rb_ary_new_from_values(long n, const VALUE *elts)
ary = rb_ary_new2(n);
if (n > 0 && elts) {
+ assert(!OBJ_PROMOTED(obj));
RARRAY_PTR_USE(ary, ptr, {
MEMCPY(ptr, elts, VALUE, n); /* new array is not old gen */
});