* array.c (rb_ary_assoc): check and convert inner arrays (assocs)

  using #to_ary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 3 deletions

diff --git a/array.c b/array.c
index f801931b54..16ac706941 100644
--- a/array.c
+++ b/array.c
@@ -2283,9 +2283,8 @@ rb_ary_assoc(VALUE ary, VALUE key)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_PTR(ary)[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY_LEN(v) > 0 &&
+	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
 	    rb_equal(RARRAY_PTR(v)[0], key))
 	    return v;
     }