Check if `to_int` returns `fixnum` value; fix #3946

75c1fccd · Yukihiro "Matz" Matsumoto · ef1a0e63 · 75c1fccd
Commit 75c1fccd authored Feb 13, 2018 by Yukihiro "Matz" Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/object.c src/object.c +2 -2

No files found.
--- a/src/object.c
+++ b/src/object.c
@@ -569,8 +569,8 @@ arg_error:
    mrb_raise(mrb, E_ARGUMENT_ERROR, "base specified for non string value");
  }
  tmp = convert_type(mrb, val, "Integer", "to_int", FALSE);
-  if (mrb_nil_p(tmp)) {
-    return mrb_to_integer(mrb, val, "to_i");
+  if (mrb_nil_p(tmp) || !mrb_fixnum_p(tmp)) {
+    tmp = mrb_to_integer(mrb, val, "to_i");
  }
  return tmp;
 }