diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-05 22:54:55 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-05 22:54:55 +0900 |
| commit | 260d38d5ee5228bcfae1a834357ed58bbb96ea80 (patch) | |
| tree | 12422d1ade4d3db453d84578e04c6db12a0a1e63 /src/numeric.c | |
| parent | 2ceb71f97021d6d42b802e7edf522dd16357a932 (diff) | |
| parent | cf8df563c0ea9b98714e701ad235acbefc091558 (diff) | |
| download | mruby-260d38d5ee5228bcfae1a834357ed58bbb96ea80.tar.gz mruby-260d38d5ee5228bcfae1a834357ed58bbb96ea80.zip | |
Merge pull request #2200 from cremno/add-functions-for-safe-addition-and-subtraction
Add functions for safe addition and subtraction
Diffstat (limited to 'src/numeric.c')
| -rw-r--r-- | src/numeric.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/numeric.c b/src/numeric.c index 56835edbf..7b025c34d 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -1109,9 +1109,7 @@ mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y) if (a == 0) return y; b = mrb_fixnum(y); - c = a + b; - if (((a < 0) ^ (b < 0)) == 0 && (a < 0) != (c < 0)) { - /* integer overflow */ + if (mrb_int_add_overflow(a, b, &c)) { return mrb_float_value(mrb, (mrb_float)a + (mrb_float)b); } return mrb_fixnum_value(c); @@ -1147,9 +1145,7 @@ mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y) mrb_int b, c; b = mrb_fixnum(y); - c = a - b; - if (((a < 0) ^ (b < 0)) != 0 && (a < 0) != (c < 0)) { - /* integer overflow */ + if (mrb_int_sub_overflow(a, b, &c)) { return mrb_float_value(mrb, (mrb_float)a - (mrb_float)b); } return mrb_fixnum_value(c); |