summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2018-04-17 23:08:36 +0900
committerGitHub <[email protected]>2018-04-17 23:08:36 +0900
commitf7cf5812b1288d6ca21daff31b4a2b91ea2a06ed (patch)
tree686329358b0084b362f971707c79328dd7e3ffd8 /src/string.c
parent4880f6dc8982dc794a7ed149ed6fef86821e8257 (diff)
parent87ef6aeb02b75f71138a0b3a74db00e5a366efed (diff)
downloadmruby-f7cf5812b1288d6ca21daff31b4a2b91ea2a06ed.tar.gz
mruby-f7cf5812b1288d6ca21daff31b4a2b91ea2a06ed.zip
Merge pull request #4003 from take-cheeze/int32_overflow
Fallback to float when compiled binary with 64bit compiler.
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/string.c b/src/string.c
index 469335bb9..8ebd11b6c 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2167,8 +2167,13 @@ mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base,
n *= base;
n += c;
if (n > (uint64_t)MRB_INT_MAX + (sign ? 0 : 1)) {
- mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%S) too big for integer",
- mrb_str_new(mrb, str, pend-str));
+ if (base == 10) {
+ return mrb_float_value(mrb, mrb_str_to_dbl(mrb, mrb_str_new(mrb, str, len), badcheck));
+ }
+ else {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%S) too big for integer",
+ mrb_str_new(mrb, str, pend-str));
+ }
}
}
val = (mrb_int)n;