Issue #22604: Fix assertion error in debug mode when dividing a complex number by (nan+0j).

This commit is contained in:
Antoine Pitrou 2014-10-10 23:51:04 +02:00
commit 759920c5cb
3 changed files with 16 additions and 4 deletions

View file

@ -78,7 +78,7 @@ _Py_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 @@ _Py_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 @@ _Py_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;
}