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

unsigned long may be smaller than mrb_int; use uint64_t instead; fix #2935

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-09-03 00:14:37 +09:00
parent 3a462fe468
commit e35c3aff83
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-sprintf/src/sprintf.c
+1 -1
View File
@@ -73,7 +73,7 @@ mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
{
char buf[64], *b = buf + sizeof buf;
mrb_int num = mrb_fixnum(x);
unsigned long val = (unsigned long)num;
uint64_t val = (uint64_t)num;
char d;
if (base != 2) {
src/string.c
+4 -4
View File
@@ -1863,7 +1863,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
const char *p;
char sign = 1;
int c, uscore;
unsigned long n = 0;
uint64_t n = 0;
mrb_int val;
#define conv_digit(c) \
@@ -1983,9 +1983,9 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
}
n *= base;
n += c;
}
if (n > MRB_INT_MAX) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%S) too big for integer", mrb_str_new_cstr(mrb, str));
if (n > MRB_INT_MAX) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%S) too big for integer", mrb_str_new_cstr(mrb, str));
}
}
val = n;
if (badcheck) {