diff options
| -rw-r--r-- | include/mruby/throw.h | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-rational/src/rational.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/mruby/throw.h b/include/mruby/throw.h index 39f2c450b..52171e9b0 100644 --- a/include/mruby/throw.h +++ b/include/mruby/throw.h @@ -35,6 +35,9 @@ typedef mrb_int mrb_jmpbuf_impl; #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #define MRB_SETJMP _setjmp #define MRB_LONGJMP _longjmp +#elif defined(__MINGW64__) && defined(__GNUC__) && __GNUC__ >= 4 +#define MRB_SETJMP __builtin_setjmp +#define MRB_LONGJMP __builtin_longjmp #else #define MRB_SETJMP setjmp #define MRB_LONGJMP longjmp diff --git a/mrbgems/mruby-rational/src/rational.c b/mrbgems/mruby-rational/src/rational.c index 85b1dff07..23d70fc04 100644 --- a/mrbgems/mruby-rational/src/rational.c +++ b/mrbgems/mruby-rational/src/rational.c @@ -77,6 +77,9 @@ rational_new(mrb_state *mrb, mrb_int numerator, mrb_int denominator) struct mrb_rational *p; struct RBasic *rat = rational_alloc(mrb, c, &p); if (denominator < 0) { + if (numerator == MRB_INT_MIN || denominator == MRB_INT_MIN) { + mrb_raise(mrb, E_RANGE_ERROR, "integer overflow in rational"); + } numerator *= -1; denominator *= -1; } @@ -115,6 +118,9 @@ rational_new_f(mrb_state *mrb, mrb_float f0) if (f < 0) { neg = 1; f = -f; } while (f != floor(f)) { n <<= 1; f *= 2; } + if (!TYPED_FIXABLE(f, rat_float)) { + mrb_raise(mrb, E_RANGE_ERROR, "integer overflow in rational"); + } d = (mrb_int)f; /* continued fraction and check denominator each step */ |