From cfcca2a727e2af8aa789d7a29bbe612628e84893 Mon Sep 17 00:00:00 2001
From: Jared Breeden <jared.breeden@gmail.com>
Date: Mon, 22 Jun 2015 19:49:12 -0700
Subject: Reverting overzealous changes

---
 src/object.c | 2 +-
 src/string.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/object.c b/src/object.c
index df7d77b9e..c5fb74575 100644
--- a/src/object.c
+++ b/src/object.c
@@ -539,7 +539,7 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
 
     case MRB_TT_STRING:
     string_conv:
-      return mrb_str_to_inum(mrb, val, base, FALSE);
+      return mrb_str_to_inum(mrb, val, base, TRUE);
 
     default:
       break;
diff --git a/src/string.c b/src/string.c
index 9f753a0cf..9a1a6fba1 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2003,6 +2003,7 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
   const char *s;
   mrb_int len;
 
+  str = mrb_str_to_str(mrb, str);
   if (badcheck) {
     s = mrb_string_value_cstr(mrb, &str);
   }
-- 
cgit v1.2.3