From 44c5c2a3120439af7560f9694dcb117953ee3119 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 17 Feb 2013 11:55:50 +0000 Subject: compar.c: inversed comarison without infinite recursion * compar.c (rb_invcmp): compare by inversed comarison, with preventing from infinite recursion. [ruby-core:52305] [Bug #7870] * string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite recursion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'compar.c') diff --git a/compar.c b/compar.c index 6762786276..c89c752daf 100644 --- a/compar.c +++ b/compar.c @@ -31,6 +31,26 @@ rb_cmperr(VALUE x, VALUE y) rb_obj_classname(x), classname); } +static VALUE +invcmp_recursive(VALUE x, VALUE y, int recursive) +{ + if (recursive) return Qnil; + return rb_check_funcall(y, cmp, 1, &x); +} + +VALUE +rb_invcmp(VALUE x, VALUE y) +{ + VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y); + if (invcmp == Qundef || NIL_P(invcmp)) { + return Qnil; + } + else { + int result = -rb_cmpint(invcmp, x, y); + return INT2FIX(result); + } +} + static VALUE cmp_eq(VALUE *a) { -- cgit v1.2.3