There was an error while loading. Please reload this page.
1 parent 7b2185b commit 85ac814Copy full SHA for 85ac814
3 files changed
Lib/test/test_complex.py
@@ -1,4 +1,5 @@
1
import unittest
2
+import sys
3
from test import support
4
from test.test_grammar import (VALID_UNDERSCORE_LITERALS,
5
INVALID_UNDERSCORE_LITERALS)
@@ -206,6 +207,26 @@ def test_pow(self):
206
207
b = 5.1+2.3j
208
self.assertRaises(ValueError, pow, a, b, 0)
209
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
226
+ c ** c
227
228
229
+
230
def test_boolcontext(self):
231
for i in range(100):
232
self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst
@@ -0,0 +1 @@
+Fix undefined behaviour in complex object exponentiation.
Objects/complexobject.c
@@ -529,8 +529,6 @@ static PyObject *
529
complex_pow(PyObject *v, PyObject *w, PyObject *z)
530
{
531
Py_complex p;
532
- Py_complex exponent;
533
- long int_exponent;
534
Py_complex a, b;
535
TO_COMPLEX(v, a);
536
TO_COMPLEX(w, b);
@@ -540,12 +538,21 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
540
538
return NULL;
541
539
}
542
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);
+ // Check if w is an integer value that fits inside a C long, so we can
+ // use a faster algorithm. TO_COMPLEX(w, b), above, already handled the
+ // conversion from larger longs, as well as other types.
+ if (PyLong_Check(w)) {
+ int overflow = 0;
+ long int_exponent = PyLong_AsLongAndOverflow(w, &overflow);
+ if (int_exponent == -1 && PyErr_Occurred())
+ 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
555
+ }
556
557
Py_ADJUST_ERANGE2(p.real, p.imag);
558
if (errno == EDOM) {
0 commit comments