summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-10-20 14:07:35 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-10-20 15:35:31 +0900
commit7563604fb868d87057733f52d780d841fc1ab6bb (patch)
tree886c3624e49a970cd9469cf3e2a717c1e6735654 /object.c
parent4f1e0bfacd93c28bff549e2f3603c3b4942429a3 (diff)
downloadruby-7563604fb868d87057733f52d780d841fc1ab6bb.tar.gz
[Bug #18998] Honor `#to_str` next to `#to_int` in `Kernel#Integer`
Diffstat (limited to 'object.c')
-rw-r--r--object.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/object.c b/object.c
index d0c0e34f82..0d99c6db47 100644
--- a/object.c
+++ b/object.c
@@ -3138,6 +3138,9 @@ rb_convert_to_integer(VALUE val, int base, int raise_exception)
tmp = rb_protect(rb_check_to_int, val, NULL);
if (RB_INTEGER_TYPE_P(tmp)) return tmp;
rb_set_errinfo(Qnil);
+ if (!NIL_P(tmp = rb_check_string_type(val))) {
+ return rb_str_convert_to_inum(tmp, base, TRUE, raise_exception);
+ }
if (!raise_exception) {
VALUE result = rb_protect(rb_check_to_i, val, NULL);