From 08a0c9f32843d4ebe17476608d6b2f3d8d703313 Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Thu, 14 Mar 2013 23:12:21 +0900 Subject: add mrb_int overflow check for mrb_int --- src/string.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/string.c') diff --git a/src/string.c b/src/string.c index cd70e63f6..d474f6f96 100644 --- a/src/string.c +++ b/src/string.c @@ -2050,6 +2050,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck) char *end; char sign = 1; int c; + unsigned int n; mrb_int val; #undef ISDIGIT @@ -2154,8 +2155,11 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck) return mrb_fixnum_value(0); } - val = strtoul((char*)str, &end, base); - + n = strtoul((char*)str, &end, base); + if (n > MRB_INT_MAX) { + mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%s) too big for integer", str); + } + val = n; if (badcheck) { if (end == str) goto bad; /* no number */ while (*end && ISSPACE(*end)) end++; -- cgit v1.2.3