From 9086f9260f1f48a231cba4e7123eb7ac8159ba40 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 10 Oct 2014 23:49:32 +0200 Subject: Issue #22604: Fix assertion error in debug mode when dividing a complex number by (nan+0j). --- Objects/complexobject.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Objects') diff --git a/Objects/complexobject.c b/Objects/complexobject.c index a5b76f0460..0128120e7f 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -78,7 +78,7 @@ c_quot(Py_complex a, Py_complex b) const double abs_breal = b.real < 0 ? -b.real : b.real; const double abs_bimag = b.imag < 0 ? -b.imag : b.imag; - if (abs_breal >= abs_bimag) { + if (abs_breal >= abs_bimag) { /* divide tops and bottom by b.real */ if (abs_breal == 0.0) { errno = EDOM; @@ -91,7 +91,7 @@ c_quot(Py_complex a, Py_complex b) r.imag = (a.imag - a.real * ratio) / denom; } } - else { + else if (abs_bimag >= abs_breal) { /* divide tops and bottom by b.imag */ const double ratio = b.real / b.imag; const double denom = b.real * ratio + b.imag; @@ -99,6 +99,10 @@ c_quot(Py_complex a, Py_complex b) r.real = (a.real * ratio + a.imag) / denom; r.imag = (a.imag * ratio - a.real) / denom; } + else { + /* At least one of b.real or b.imag is a NaN */ + r.real = r.imag = Py_NAN; + } return r; } -- cgit v1.2.1