From aa3cb0466e39d8a0f548f569461efec1ca07bb6b Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 19 Jul 2017 09:49:41 +0900 Subject: Avoid C undefined behavior of division by zero; close #3745 --- src/vm.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/vm.c b/src/vm.c index 19bb9ef45..becad5921 100644 --- a/src/vm.c +++ b/src/vm.c @@ -2376,7 +2376,14 @@ RETRY_TRY_BLOCK: { mrb_int x = mrb_fixnum(regs[a]); mrb_int y = mrb_fixnum(regs[a+1]); - SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x / (mrb_float)y); + double f; + if (y == 0) { + f = INFINITY; + } + else { + f = (mrb_float)x / (mrb_float)y; + } + SET_FLOAT_VALUE(mrb, regs[a], f); } break; case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT): @@ -2391,7 +2398,14 @@ RETRY_TRY_BLOCK: { mrb_float x = mrb_float(regs[a]); mrb_int y = mrb_fixnum(regs[a+1]); - SET_FLOAT_VALUE(mrb, regs[a], x / y); + double f; + if (y == 0) { + f = INFINITY; + } + else { + f = x / y; + } + SET_FLOAT_VALUE(mrb, regs[a], f); } #else OP_MATH_BODY(/,mrb_float,mrb_fixnum); -- cgit v1.2.3