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

Bugfix nagative-number lshift() bit overflow

Browse Source
This commit is contained in:
murase_syuka
2015-11-18 21:37:17 +09:00
parent 557ab3472a
commit ef95dcd390
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+16 -3
View File
@@ -821,15 +821,28 @@ static mrb_value
lshift(mrb_state *mrb, mrb_int val, mrb_int width)
{
mrb_assert(width > 0);
if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
(val > (MRB_INT_MAX >> width))) {
if (val > 0) {
if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
(val > (MRB_INT_MAX >> width))) {
goto bit_overflow;
}
} else {
if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
(val < (MRB_INT_MIN >> width))) {
goto bit_overflow;
}
}
return mrb_fixnum_value(val << width);
bit_overflow:
{
mrb_float f = (mrb_float)val;
while (width--) {
f *= 2;
}
return mrb_float_value(mrb, f);
}
return mrb_fixnum_value(val << width);
}
static mrb_value