Skip to content

Commit 85ac814

Browse files
bpo-44698: Fix undefined behaviour in complex exponentiation. (GH-27278) (GH-27367)
(cherry picked from commit 1d582bb) Co-authored-by: T. Wouters <thomas@python.org>
1 parent 7b2185b commit 85ac814

File tree

3 files changed

+37
-8
lines changed

3 files changed

+37
-8
lines changed

Lib/test/test_complex.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import unittest
2+
import sys
23
from test import support
34
from test.test_grammar import (VALID_UNDERSCORE_LITERALS,
45
INVALID_UNDERSCORE_LITERALS)
@@ -206,6 +207,26 @@ def test_pow(self):
206207
b = 5.1+2.3j
207208
self.assertRaises(ValueError, pow, a, b, 0)
208209

210+
# Check some boundary conditions; some of these used to invoke
211+
# undefined behaviour (https://bugs.python.org/issue44698). We're
212+
# not actually checking the results of these operations, just making
213+
# sure they don't crash (for example when using clang's
214+
# UndefinedBehaviourSanitizer).
215+
values = (sys.maxsize, sys.maxsize+1, sys.maxsize-1,
216+
-sys.maxsize, -sys.maxsize+1, -sys.maxsize+1)
217+
for real in values:
218+
for imag in values:
219+
with self.subTest(real=real, imag=imag):
220+
c = complex(real, imag)
221+
try:
222+
c ** real
223+
except OverflowError:
224+
pass
225+
try:
226+
c ** c
227+
except OverflowError:
228+
pass
229+
209230
def test_boolcontext(self):
210231
for i in range(100):
211232
self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix undefined behaviour in complex object exponentiation.

Objects/complexobject.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,6 @@ static PyObject *
529529
complex_pow(PyObject *v, PyObject *w, PyObject *z)
530530
{
531531
Py_complex p;
532-
Py_complex exponent;
533-
long int_exponent;
534532
Py_complex a, b;
535533
TO_COMPLEX(v, a);
536534
TO_COMPLEX(w, b);
@@ -540,12 +538,21 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
540538
return NULL;
541539
}
542540
errno = 0;
543-
exponent = b;
544-
int_exponent = (long)exponent.real;
545-
if (exponent.imag == 0. && exponent.real == int_exponent)
546-
p = c_powi(a, int_exponent);
547-
else
548-
p = _Py_c_pow(a, exponent);
541+
// Check if w is an integer value that fits inside a C long, so we can
542+
// use a faster algorithm. TO_COMPLEX(w, b), above, already handled the
543+
// conversion from larger longs, as well as other types.
544+
if (PyLong_Check(w)) {
545+
int overflow = 0;
546+
long int_exponent = PyLong_AsLongAndOverflow(w, &overflow);
547+
if (int_exponent == -1 && PyErr_Occurred())
548+
return NULL;
549+
if (overflow == 0)
550+
p = c_powi(a, int_exponent);
551+
else
552+
p = _Py_c_pow(a, b);
553+
} else {
554+
p = _Py_c_pow(a, b);
555+
}
549556

550557
Py_ADJUST_ERANGE2(p.real, p.imag);
551558
if (errno == EDOM) {

0 commit comments

Comments
 (0)