summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-23 03:30:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-23 03:30:30 +0000
commit4a574f7ad985d7e5d1d1596b7632e4db8620e65b (patch)
treeaf9f00c29a4684b4dc957ee72b1dbd24418c763b
parentcb2a99822e3260fa664a24d96841e21767b9f50b (diff)
bigdecimal.c: fix FloatDomainError
* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider non-finite float values not to raise FloatDomainError. [ruby-core:75682] [Bug #12414] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/bigdecimal/bigdecimal.c6
-rw-r--r--test/bigdecimal/test_bigdecimal.rb12
3 files changed, 24 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index de2e739447b..2a86630a400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 23 12:30:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
+ non-finite float values not to raise FloatDomainError.
+ [ruby-core:75682] [Bug #12414]
+
Mon May 23 12:21:18 2016 NARUSE, Yui <naruse@ruby-lang.org>
* array.c (rb_ary_fill): suppress warnings: 'item' may be used
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 9125e6b5858..3ccad9a508a 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -239,6 +239,12 @@ again:
if (prec < 0) goto unable_to_coerce_without_prec;
if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
d = RFLOAT_VALUE(v);
+ if (!isfinite(d)) {
+ pv = VpCreateRbObject(prec, NULL);
+ pv->sign = isnan(d) ? VP_SIGN_NaN :
+ d > 0 ? VP_SIGN_POSITIVE_INFINITE : VP_SIGN_NEGATIVE_FINITE;
+ return pv;
+ }
if (d != 0.0) {
v = rb_funcall(v, id_to_r, 0);
goto again;
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index f10c50b47a9..4296b50c598 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -459,6 +459,18 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(false, BigDecimal.new("NaN") > n1)
end
+ def test_cmp_float_nan
+ assert_equal(nil, BigDecimal.new("1") <=> Float::NAN)
+ end
+
+ def test_cmp_float_pos_inf
+ assert_equal(-1, BigDecimal.new("1") <=> Float::INFINITY)
+ end
+
+ def test_cmp_float_neg_inf
+ assert_equal(+1, BigDecimal.new("1") <=> -Float::INFINITY)
+ end
+
def test_cmp_failing_coercion
n1 = BigDecimal.new("1")
assert_equal(nil, n1 <=> nil)