From 0ab44dbc3cf92c459c045d4b8272380e417f4552 Mon Sep 17 00:00:00 2001
From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 10 Jun 2013 14:54:21 +0000
Subject: [PATCH] fix a typo

* 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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 array.c   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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 */
 	});