Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.10] bpo-44698: Fix undefined behaviour in complex exponentiation. (GH-27278) #27366

Merged
merged 1 commit into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Lib/test/test_complex.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import unittest
import sys
from test import support
from test.test_grammar import (VALID_UNDERSCORE_LITERALS,
INVALID_UNDERSCORE_LITERALS)
Expand Down Expand Up @@ -248,6 +249,26 @@ def test_pow(self):
b = 5.1+2.3j
self.assertRaises(ValueError, pow, a, b, 0)

# Check some boundary conditions; some of these used to invoke
# undefined behaviour (https://bugs.python.org/issue44698). We're
# not actually checking the results of these operations, just making
# sure they don't crash (for example when using clang's
# UndefinedBehaviourSanitizer).
values = (sys.maxsize, sys.maxsize+1, sys.maxsize-1,
-sys.maxsize, -sys.maxsize+1, -sys.maxsize+1)
for real in values:
for imag in values:
with self.subTest(real=real, imag=imag):
c = complex(real, imag)
try:
c ** real
except OverflowError:
pass
try:
c ** c
except OverflowError:
pass

def test_boolcontext(self):
for i in range(100):
self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix undefined behaviour in complex object exponentiation.
23 changes: 15 additions & 8 deletions Objects/complexobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,6 @@ static PyObject *
complex_pow(PyObject *v, PyObject *w, PyObject *z)
{
Py_complex p;
Py_complex exponent;
long int_exponent;
Py_complex a, b;
TO_COMPLEX(v, a);
TO_COMPLEX(w, b);
Expand All @@ -525,12 +523,21 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
return NULL;
}
errno = 0;
exponent = b;
int_exponent = (long)exponent.real;
if (exponent.imag == 0. && exponent.real == int_exponent)
p = c_powi(a, int_exponent);
else
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;
if (overflow == 0)
p = c_powi(a, int_exponent);
else
p = _Py_c_pow(a, b);
} else {
p = _Py_c_pow(a, b);
}

Py_ADJUST_ERANGE2(p.real, p.imag);
if (errno == EDOM) {
Expand Down