2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8c1340b8a..1a7bc2a488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 10 23:51:51 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* array.c (rb_ary_new_from_values): fix a typo. pointed out by
+	  nagachika.
+	  http://d.hatena.ne.jp/nagachika/20130610/ruby_trunk_changes_41199_41220
+
 Mon Jun 10 21:51:03 2013  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
diff --git a/array.c b/array.c
index 7f423ed3bb..8ef0b860ee 100644
--- a/array.c
+++ b/array.c
@@ -456,7 +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));
+	assert(!OBJ_PROMOTED(ary));
 	RARRAY_PTR_USE(ary, ptr, {
 	    MEMCPY(ptr, elts, VALUE, n); /* new array is not old gen */
 	});