kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* array.c (rb_ary_eql, rb_ary_cmp): get rid of stack overflow with

Browse source 
self-recursive constructs.  [ruby-Bugs-18356]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-26 06:30:38 +00:00
parent c4693e62af
commit eccb4ca2e7
2 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 26 15:30:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_eql, rb_ary_cmp): get rid of stack overflow with
self-recursive constructs. [ruby-Bugs-18356]
Tue Feb 26 01:16:01 2008 Tanaka Akira <akr@fsij.org> Tue Feb 26 01:16:01 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN. * include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.

58
array.c
View file

@ -317,7 +317,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
rb_raise(rb_eArgError, "array size too big"); rb_raise(rb_eArgError, "array size too big");
} }
rb_ary_modify(ary); rb_ary_modify(ary);
RESIZE_CAPA(ary, len); RESIZE_CAPA(ary, len);
if (rb_block_given_p()) { if (rb_block_given_p()) {
long i; long i;
@ -2343,6 +2343,19 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
return rb_exec_recursive(recursive_equal, ary1, ary2); return rb_exec_recursive(recursive_equal, ary1, ary2);
} }
static VALUE
recursive_eql(VALUE ary1, VALUE ary2, int recur)
{
long i;
if (recur) return Qfalse;
for (i=0; i<RARRAY_LEN(ary1); i++) {
if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
return Qfalse;
}
return Qtrue;
}
/* /*
* call-seq: * call-seq:
* array.eql?(other) -> true or false * array.eql?(other) -> true or false
@ -2354,16 +2367,10 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
static VALUE static VALUE
rb_ary_eql(VALUE ary1, VALUE ary2) rb_ary_eql(VALUE ary1, VALUE ary2)
{ {
long i;
if (ary1 == ary2) return Qtrue; if (ary1 == ary2) return Qtrue;
if (TYPE(ary2) != T_ARRAY) return Qfalse; if (TYPE(ary2) != T_ARRAY) return Qfalse;
if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
for (i=0; i<RARRAY_LEN(ary1); i++) { return rb_exec_recursive(recursive_eql, ary1, ary2);
if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
return Qfalse;
}
return Qtrue;
} }
static VALUE static VALUE
@ -2425,6 +2432,25 @@ rb_ary_includes(VALUE ary, VALUE item)
} }
static VALUE
recursive_cmp(VALUE ary1, VALUE ary2, int recur)
{
long i, len;
if (recur) return Qnil;
len = RARRAY_LEN(ary1);
if (len > RARRAY_LEN(ary2)) {
len = RARRAY_LEN(ary2);
}
for (i=0; i<RARRAY_LEN(ary1); i++) {
VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
if (v != INT2FIX(0)) {
return v;
}
}
return Qundef;
}
/* /*
* call-seq: * call-seq:
* array <=> other_array -> -1, 0, +1 * array <=> other_array -> -1, 0, +1
@ -2448,19 +2474,13 @@ rb_ary_includes(VALUE ary, VALUE item)
VALUE VALUE
rb_ary_cmp(VALUE ary1, VALUE ary2) rb_ary_cmp(VALUE ary1, VALUE ary2)
{ {
long i, len; long len;
VALUE v;
ary2 = to_ary(ary2); ary2 = to_ary(ary2);
len = RARRAY_LEN(ary1); if (ary1 == ary2) return INT2FIX(0);
if (len > RARRAY_LEN(ary2)) { v = rb_exec_recursive(recursive_cmp, ary1, ary2);
len = RARRAY_LEN(ary2); if (v != Qundef) return v;
}
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;
}
}
len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2); len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
if (len == 0) return INT2FIX(0); if (len == 0) return INT2FIX(0);
if (len > 0) return INT2FIX(1); if (len > 0) return INT2FIX(1);