From 9fa56026e5eb99996d0430f7e2d07dae4aa42c52 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 14 Mar 2017 03:42:43 +0000 Subject: string.c: use rb_check_string_type * string.c (rb_str_cmp_m): use rb_check_string_type for check and conversion, instead of calling the conversion method directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/string.c b/string.c index dc4cb9f276..8569b00ff2 100644 --- a/string.c +++ b/string.c @@ -3181,19 +3181,11 @@ static VALUE rb_str_cmp_m(VALUE str1, VALUE str2) { int result; - - if (!RB_TYPE_P(str2, T_STRING)) { - VALUE tmp = rb_check_funcall(str2, idTo_str, 0, 0); - if (RB_TYPE_P(tmp, T_STRING)) { - result = rb_str_cmp(str1, tmp); - } - else { - return rb_invcmp(str1, str2); - } - } - else { - result = rb_str_cmp(str1, str2); + VALUE s = rb_check_string_type(str2); + if (NIL_P(s)) { + return rb_invcmp(str1, str2); } + result = rb_str_cmp(str1, s); return INT2FIX(result); } -- cgit v1.2.3