summaryrefslogtreecommitdiff
path: root/enum.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-01 02:31:27 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-01 02:31:27 +0000
commit2c26edc15c4d30494601d5df11daea4a26a38465 (patch)
tree83ae2e48eb7bfcc99a8e54be82ea76f2ecf05c7f /enum.c
parentf63697432e6214e4be3c38648d71ccffaa0c7545 (diff)
merge revision(s) 64014: [Backport #14926]
fix sum on infinity * array.c (rb_ary_sum): consider non-finite floats. [ruby-core:88024] [Bug #14926] * enum.c (sum_iter): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/enum.c b/enum.c
index c9344fda57..86e6125e25 100644
--- a/enum.c
+++ b/enum.c
@@ -3804,6 +3804,25 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
goto some_value;
}
+ if (isnan(f)) return;
+ if (isnan(x)) {
+ memo->v = i;
+ memo->f = x;
+ return;
+ }
+ if (isinf(x)) {
+ if (isinf(f) && signbit(x) != signbit(f)) {
+ memo->f = NAN;
+ memo->v = DBL2NUM(f);
+ }
+ else {
+ memo->f = x;
+ memo->v = i;
+ }
+ return;
+ }
+ if (isinf(f)) return;
+
t = f + x;
if (fabs(f) >= fabs(x))
c += ((f - t) + x);