summaryrefslogtreecommitdiffhomepage
path: root/src/numeric.c
diff options
context:
space:
mode:
authorcremno <[email protected]>2014-05-05 15:24:22 +0200
committercremno <[email protected]>2014-05-05 15:24:22 +0200
commit0f3930426515848be755c5480df354fa9e2109f4 (patch)
tree55997d13d181d852b2522aa0b3b69831b384e352 /src/numeric.c
parentff03cea79b710913af1f5decec1952c14ba67812 (diff)
downloadmruby-0f3930426515848be755c5480df354fa9e2109f4.tar.gz
mruby-0f3930426515848be755c5480df354fa9e2109f4.zip
add function for checked mrb_int addition
Diffstat (limited to 'src/numeric.c')
-rw-r--r--src/numeric.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/numeric.c b/src/numeric.c
index 56835edbf..8ea71ada6 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);