Skip to content

M
mruby
Unverified Commit 98799aa6 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Fix infinite recursive call bugs in integer division.

parent 3deb62d6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mrbgems/mruby-complex/src/complex.c
View file @ 98799aa6
...@@ -304,6 +304,7 @@ int_div(mrb_state *mrb, mrb_value x) ...@@ -304,6 +304,7 @@ int_div(mrb_state *mrb, mrb_value x)
} }
switch (mrb_type(y)) { switch (mrb_type(y)) {
case MRB_TT_COMPLEX: case MRB_TT_COMPLEX:
x = complex_new(mrb, (mrb_float)a, 0);
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
default: default:
return mrb_float_value(mrb, (mrb_float)a * mrb_to_flo(mrb, y)); return mrb_float_value(mrb, (mrb_float)a * mrb_to_flo(mrb, y));
...@@ -323,6 +324,7 @@ int_quo(mrb_state *mrb, mrb_value x) ...@@ -323,6 +324,7 @@ int_quo(mrb_state *mrb, mrb_value x)
switch (mrb_type(y)) { switch (mrb_type(y)) {
case MRB_TT_COMPLEX: case MRB_TT_COMPLEX:
x = complex_new(mrb, (mrb_float)a, 0);
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
default: default:
return mrb_float_value(mrb, (mrb_float)a * mrb_to_flo(mrb, y)); return mrb_float_value(mrb, (mrb_float)a * mrb_to_flo(mrb, y));
......
mrbgems/mruby-rational/src/rational.c
View file @ 98799aa6
...@@ -428,6 +428,7 @@ int_div(mrb_state *mrb, mrb_value x) ...@@ -428,6 +428,7 @@ int_div(mrb_state *mrb, mrb_value x)
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
#if defined(MRB_USE_COMPLEX) #if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX: case MRB_TT_COMPLEX:
x = mrb_complex_new(mrb, (mrb_float)a, 0);
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
#endif #endif
case MRB_TT_FLOAT: case MRB_TT_FLOAT:
...@@ -460,6 +461,7 @@ int_quo(mrb_state *mrb, mrb_value x) ...@@ -460,6 +461,7 @@ int_quo(mrb_state *mrb, mrb_value x)
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
#if defined(MRB_USE_COMPLEX) #if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX: case MRB_TT_COMPLEX:
x = mrb_complex_new(mrb, (mrb_float)a, 0);
return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y); return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
#endif #endif
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment