From 2c26edc15c4d30494601d5df11daea4a26a38465 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 Sep 2018 02:31:27 +0000
Subject: 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
---
 array.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'array.c')

diff --git a/array.c b/array.c
index fa88f47ae9..b40f05e76d 100644
--- a/array.c
+++ b/array.c
@@ -5954,6 +5954,20 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
             else
                 goto not_float;
 
+            if (isnan(f)) continue;
+            if (isnan(x)) {
+                f = x;
+                continue;
+            }
+            if (isinf(x)) {
+                if (isinf(f) && signbit(x) != signbit(f))
+                    f = NAN;
+                else
+                    f = x;
+                continue;
+            }
+            if (isinf(f)) continue;
+
             t = f + x;
             if (fabs(f) >= fabs(x))
                 c += ((f - t) + x);
-- 
cgit v1.2.3