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 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'complex.c')

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);
-- 
cgit v1.2.3