summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-08-07 15:30:52 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-08-07 15:30:52 +0900
commit0c7d29dff68b4d85fbbc9c6f8c0328ddb303f000 (patch)
tree0197b933a94ce538b0eae5cbf2839bf70c44dabb
parent4fdf492219ded3a48382970e2678f04b4fc912cd (diff)
downloadmruby-0c7d29dff68b4d85fbbc9c6f8c0328ddb303f000.tar.gz
mruby-0c7d29dff68b4d85fbbc9c6f8c0328ddb303f000.zip
FIXABLE() may work wrong on MRB_INT64; fix #2909
-rw-r--r--src/numeric.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/numeric.c b/src/numeric.c
index b9aef51d9..14c0b76a6 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -55,7 +55,8 @@ num_pow(mrb_state *mrb, mrb_value x)
mrb_get_args(mrb, "o", &y);
yv = mrb_to_flo(mrb, y);
d = pow(mrb_to_flo(mrb, x), yv);
- if (mrb_fixnum_p(x) && mrb_fixnum_p(y) && FIXABLE(d) && yv > 0)
+ if (mrb_fixnum_p(x) && mrb_fixnum_p(y) && FIXABLE(d) && yv > 0 &&
+ (d < 0 || (d > 0 && (mrb_int)d > 0)))
return mrb_fixnum_value((mrb_int)d);
return mrb_float_value(mrb, d);
}