summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJared Breeden <[email protected]>2015-06-22 19:49:12 -0700
committerJared Breeden <[email protected]>2015-06-22 19:49:12 -0700
commitcfcca2a727e2af8aa789d7a29bbe612628e84893 (patch)
treeb62055a2a8ed795f9acdcb0bc5ce131586e2e8f7 /src
parent264a059aef01b079d9788c8569182482edeab82a (diff)
downloadmruby-cfcca2a727e2af8aa789d7a29bbe612628e84893.tar.gz
mruby-cfcca2a727e2af8aa789d7a29bbe612628e84893.zip
Reverting overzealous changes
Diffstat (limited to 'src')
-rw-r--r--src/object.c2
-rw-r--r--src/string.c1
2 files changed, 2 insertions, 1 deletions
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);
}