diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-13 23:15:44 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-13 23:15:44 +0900 |
| commit | c12f64271a7a76b5405f72fff65c52c254e72be4 (patch) | |
| tree | cf5298f7873ff4267422cd1c0cb6bac2325e24f8 /src/numeric.c | |
| parent | 190d9ebbe2c3369853f7aeff5420ed3c5b645461 (diff) | |
| download | mruby-c12f64271a7a76b5405f72fff65c52c254e72be4.tar.gz mruby-c12f64271a7a76b5405f72fff65c52c254e72be4.zip | |
fix overflow error like #2244 on MRB_WORD_BOXING
Diffstat (limited to 'src/numeric.c')
| -rw-r--r-- | src/numeric.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/numeric.c b/src/numeric.c index 357e9438e..8af7bfd15 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -687,7 +687,11 @@ int_to_i(mrb_state *mrb, mrb_value num) return num; } +#ifdef MRB_FIXNUM_SHIFT +#define SQRT_INT_MAX ((mrb_int)1<<((MRB_INT_BIT-1-MRB_FIXNUM_SHIFT)/2)) +#else #define SQRT_INT_MAX ((mrb_int)1<<((MRB_INT_BIT-1)/2)) +#endif /*tests if N*N would overflow*/ #define FIT_SQRT_INT(n) (((n)<SQRT_INT_MAX)&&((n)>=-SQRT_INT_MAX)) @@ -705,7 +709,7 @@ mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y) if (FIT_SQRT_INT(a) && FIT_SQRT_INT(b)) return mrb_fixnum_value(a*b); c = a * b; - if (a != 0 && c/a != b) { + if ((a != 0 && c/a != b) || !FIXABLE(c)) { return mrb_float_value(mrb, (mrb_float)a*(mrb_float)b); } return mrb_fixnum_value(c); |