admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid uint64_t in string-to-integer conversion; ref #5201

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-01-02 12:45:29 +09:00
parent 4ac73307fd
commit c1f05a7fb3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+7 -5
View File
@@ -2216,7 +2216,7 @@ mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, mrb_int base, i
const char *pend = str + len;
char sign = 1;
int c;
uint64_t n = 0;
mrb_int n = 0;
mrb_int val;
#define conv_digit(c) \
@@ -2343,15 +2343,17 @@ mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, mrb_int base, i
if (c < 0 || c >= base) {
break;
}
n *= base;
n += c;
if (n > (uint64_t)MRB_INT_MAX) {
if (sign == 0 && n == (uint64_t)MRB_INT_MIN) {
if (mrb_int_mul_overflow(n, base, &n)) goto overflow;
if (MRB_INT_MAX - c < n) {
if (sign == 0 && MRB_INT_MAX - n == c - 1) {
n = MRB_INT_MIN;
sign = 1;
break;
}
overflow:
mrb_raisef(mrb, E_RANGE_ERROR, "string (%l) too big for integer", str, pend-str);
}
n += c;
}
val = (mrb_int)n;
if (badcheck) {