admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle potential overflow in int_div and flo_idiv.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-08-27 09:43:56 +09:00
parent 5134031e18
commit e479a42757
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+8 -2
View File
@@ -120,7 +120,10 @@ int_div(mrb_state *mrb, mrb_value xv)
mrb_get_args(mrb, "o", &yv);
if (mrb_float_p(yv)) {
return mrb_fixnum_value((mrb_int)((mrb_float)mrb_integer(xv)/mrb_float(yv)));
double d = mrb_integer(xv)/mrb_float(yv);
if (MRB_INT_MIN <= d && d <= MRB_INT_MAX)
return mrb_int_value(mrb, (mrb_int)d);
return mrb_float_value(mrb, d);
}
else
#endif
@@ -202,7 +205,10 @@ flo_idiv(mrb_state *mrb, mrb_value x)
mrb_float y;
mrb_get_args(mrb, "f", &y);
return mrb_int_value(mrb, (mrb_int)(mrb_to_flo(mrb, x) / y));
y = mrb_to_flo(mrb, x) / y;
if (MRB_INT_MIN <= y && y <= MRB_INT_MAX)
return mrb_int_value(mrb, (mrb_int)y);
return mrb_float_value(mrb, y);
}
static mrb_value