summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey B Kirpichev <skirpichev@gmail.com>2024-09-18 08:39:11 (GMT)
committerGitHub <noreply@github.com>2024-09-18 08:39:11 (GMT)
commit8a284e189673582e262744618f293f9901a32e49 (patch)
treebacc735fda350b18f021cbd9e8c1b679529520c7
parent81480e6edb34774d783d018d1f0e61ab5c3f0a9a (diff)
downloadcpython-8a284e189673582e262744618f293f9901a32e49.zip
cpython-8a284e189673582e262744618f293f9901a32e49.tar.gz
cpython-8a284e189673582e262744618f293f9901a32e49.tar.bz2
gh-119771: Set errno on overflows in _Py_c_pow() (#120256)
Before we did this in complex_pow() and behavior of the public C API function _Py_c_pow() was different from the pure-python pow().
-rw-r--r--Doc/c-api/complex.rst2
-rw-r--r--Lib/test/test_capi/test_complex.py6
-rw-r--r--Misc/NEWS.d/next/C API/2024-06-08-08-33-40.gh-issue-119771.Oip2dL.rst2
-rw-r--r--Objects/complexobject.c4
4 files changed, 12 insertions, 2 deletions
diff --git a/Doc/c-api/complex.rst b/Doc/c-api/complex.rst
index 67d0c5f..16bd794 100644
--- a/Doc/c-api/complex.rst
+++ b/Doc/c-api/complex.rst
@@ -79,6 +79,8 @@ pointers. This is consistent throughout the API.
If *num* is null and *exp* is not a positive real number,
this method returns zero and sets :c:data:`errno` to :c:macro:`!EDOM`.
+ Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
+
Complex Numbers as Python Objects
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Lib/test/test_capi/test_complex.py b/Lib/test/test_capi/test_complex.py
index 328ea12..368edfb 100644
--- a/Lib/test/test_capi/test_complex.py
+++ b/Lib/test/test_capi/test_complex.py
@@ -226,7 +226,11 @@ class CAPIComplexTest(unittest.TestCase):
self.assertEqual(_py_c_pow(0j, -1)[1], errno.EDOM)
self.assertEqual(_py_c_pow(0j, 1j)[1], errno.EDOM)
- self.assertEqual(_py_c_pow(*[DBL_MAX+1j]*2)[0], complex(*[INF]*2))
+ max_num = DBL_MAX+1j
+ self.assertEqual(_py_c_pow(max_num, max_num),
+ (complex(INF, INF), errno.ERANGE))
+ self.assertEqual(_py_c_pow(max_num, 2),
+ (complex(INF, INF), errno.ERANGE))
def test_py_c_abs(self):
diff --git a/Misc/NEWS.d/next/C API/2024-06-08-08-33-40.gh-issue-119771.Oip2dL.rst b/Misc/NEWS.d/next/C API/2024-06-08-08-33-40.gh-issue-119771.Oip2dL.rst
new file mode 100644
index 0000000..6161908
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2024-06-08-08-33-40.gh-issue-119771.Oip2dL.rst
@@ -0,0 +1,2 @@
+Set :data:`errno` in :c:func:`_Py_c_pow` on overflows. Patch by Sergey B
+Kirpichev.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 4a8dac6..787235c 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -173,6 +173,8 @@ _Py_c_pow(Py_complex a, Py_complex b)
}
r.real = len*cos(phase);
r.imag = len*sin(phase);
+
+ _Py_ADJUST_ERANGE2(r.real, r.imag);
}
return r;
}
@@ -567,12 +569,12 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
// a faster and more accurate algorithm.
if (b.imag == 0.0 && b.real == floor(b.real) && fabs(b.real) <= 100.0) {
p = c_powi(a, (long)b.real);
+ _Py_ADJUST_ERANGE2(p.real, p.imag);
}
else {
p = _Py_c_pow(a, b);
}
- _Py_ADJUST_ERANGE2(p.real, p.imag);
if (errno == EDOM) {
PyErr_SetString(PyExc_ZeroDivisionError,
"zero to a negative or complex power");