diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-19 23:57:11 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-19 23:57:11 +0000 |
commit | 0558cc52725888379bf7ba1c81f37a31921df081 (patch) | |
tree | 6e8dbb276530cf65469432215b3bcc4059f76c9f /time.c | |
parent | 855f97202af9c55307a19c45c4a8d95cfb7d99d0 (diff) |
Merge revision 39292:
* 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/branches/ruby_2_0_0@39325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r-- | time.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -3365,12 +3365,7 @@ time_cmp(VALUE time1, VALUE time2) n = wcmp(tobj1->timew, tobj2->timew); } else { - VALUE tmp; - - tmp = rb_funcall(time2, rb_intern("<=>"), 1, time1); - if (NIL_P(tmp)) return Qnil; - - n = -rb_cmpint(tmp, time1, time2); + return rb_invcmp(time1, time2); } if (n == 0) return INT2FIX(0); if (n > 0) return INT2FIX(1); |