From d9ff0a6c2279d7329438686a73b25b07d06067c4 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 25 Oct 2007 16:52:40 +0000 Subject: * 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 --- array.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'array.c') 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; } -- cgit v1.2.3