summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-26 07:38:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-26 07:38:13 +0000
commitf2007660fa9a0e15287a742738cb0fe79772ed44 (patch)
tree757bd5aab36c4d0d6e750f9b29278756934674ee
parentcb41935353f8ea5beafa22c6b1fa44998d150159 (diff)
downloadruby-f2007660fa9a0e15287a742738cb0fe79772ed44.tar.gz
ruby-f2007660fa9a0e15287a742738cb0fe79772ed44.tar.xz
ruby-f2007660fa9a0e15287a742738cb0fe79772ed44.zip
* array.c (recursive_cmp): compare minimal length parts.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--array.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d075f735..96371042d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 26 16:38:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (recursive_cmp): compare minimal length parts.
+
Tue Feb 26 16:06:00 2008 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.
diff --git a/array.c b/array.c
index b92d3fb5d..2832c838c 100644
--- a/array.c
+++ b/array.c
@@ -2442,7 +2442,7 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
if (len > RARRAY_LEN(ary2)) {
len = RARRAY_LEN(ary2);
}
- for (i=0; i<RARRAY_LEN(ary1); i++) {
+ for (i=0; i<len; i++) {
VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
if (v != INT2FIX(0)) {
return v;