diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-18 04:19:32 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-18 04:19:32 +0000 |
| commit | 283b3d8f99c01a13e727b2edf0a7643a67d16361 (patch) | |
| tree | f1e2753826bda61aa0e0f259163dd0641c813434 /rational.c | |
| parent | b9289589d66efec4a5953e8a964019201aaeca9e (diff) | |
merge revision(s) 66796,66797: [Backport #15525]
No TypeError at nil if exception: false
[ruby-core:91021] [Bug #15525]
No FloatDomainError at non-finitive number if exception: false
[ruby-core:91021] [Bug #15525]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
| -rw-r--r-- | rational.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rational.c b/rational.c index 236bc08e39..435a68f421 100644 --- a/rational.c +++ b/rational.c @@ -2561,8 +2561,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)) |