From 62c17a2f21b47243071075cbef37fe72b6ecd0ff Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 12 Jan 2019 05:02:58 +0000
Subject: No TypeError at nil if exception: false

[ruby-core:91021] [Bug #15525]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 complex.c                  | 4 +++-
 rational.c                 | 4 +++-
 test/ruby/test_complex.rb  | 6 ++++++
 test/ruby/test_rational.rb | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/complex.c b/complex.c
index 112135c7dd..e5d4a1192a 100644
--- a/complex.c
+++ b/complex.c
@@ -1943,8 +1943,10 @@ to_complex(VALUE val)
 static VALUE
 nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
 {
-    if (NIL_P(a1) || NIL_P(a2))
+    if (NIL_P(a1) || NIL_P(a2)) {
+        if (!raise) return Qnil;
 	rb_raise(rb_eTypeError, "can't convert nil into Complex");
+    }
 
     if (RB_TYPE_P(a1, T_STRING)) {
 	a1 = string_to_c_strict(a1, raise);
diff --git a/rational.c b/rational.c
index 1642bc3a7d..207c4c46b3 100644
--- a/rational.c
+++ b/rational.c
@@ -2559,8 +2559,10 @@ nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise)
     VALUE a1 = numv, a2 = denv;
     int state;
 
-    if (NIL_P(a1) || NIL_P(a2))
+    if (NIL_P(a1) || NIL_P(a2)) {
+        if (!raise) return Qnil;
         rb_raise(rb_eTypeError, "can't convert nil into Rational");
+    }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
         if (k_exact_zero_p(RCOMPLEX(a1)->imag))
diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb
index 80d1dc7e55..3da66890c1 100644
--- a/test/ruby/test_complex.rb
+++ b/test/ruby/test_complex.rb
@@ -865,9 +865,15 @@ class Complex_Test < Test::Unit::TestCase
     assert_nothing_raised(ArgumentError){
       assert_equal(nil, Complex('5x', exception: false))
     }
+    assert_nothing_raised(ArgumentError){
+      assert_equal(nil, Complex(nil, exception: false))
+    }
     assert_nothing_raised(ArgumentError){
       assert_equal(nil, Complex(Object.new, exception: false))
     }
+    assert_nothing_raised(ArgumentError){
+      assert_equal(nil, Complex(1, nil, exception: false))
+    }
     assert_nothing_raised(ArgumentError){
       assert_equal(nil, Complex(1, Object.new, exception: false))
     }
diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb
index b289753347..a8cdf22a49 100644
--- a/test/ruby/test_rational.rb
+++ b/test/ruby/test_rational.rb
@@ -815,9 +815,15 @@ class Rational_Test < Test::Unit::TestCase
     assert_nothing_raised(ZeroDivisionError) {
       assert_equal(nil, Rational("1/0", exception: false))
     }
+    assert_nothing_raised(TypeError) {
+      assert_equal(nil, Rational(nil, exception: false))
+    }
     assert_nothing_raised(TypeError) {
       assert_equal(nil, Rational(Object.new, exception: false))
     }
+    assert_nothing_raised(TypeError) {
+      assert_equal(nil, Rational(1, nil, exception: false))
+    }
     assert_nothing_raised(TypeError) {
       assert_equal(nil, Rational(1, Object.new, exception: false))
     }
-- 
cgit v1.2.3