summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2023-01-21 10:23:59 (GMT)
committerGitHub <noreply@github.com>2023-01-21 10:23:59 (GMT)
commit401fdf9c851eb61229250ebffa942adca99b36d1 (patch)
tree01afb0dae67636403b5955f4aef8ddddd6a21568
parent9e947675ae3dc32f5863e5ed3022301cf7fd79b4 (diff)
downloadcpython-401fdf9c851eb61229250ebffa942adca99b36d1.zip
cpython-401fdf9c851eb61229250ebffa942adca99b36d1.tar.gz
cpython-401fdf9c851eb61229250ebffa942adca99b36d1.tar.bz2
gh-101037: Fix potential memory underallocation for zeros of int subtypes (#101038)
This PR fixes object allocation in long_subtype_new to ensure that there's at least one digit in all cases, and makes sure that the value of that digit is copied over from the source long. Needs backport to 3.11, but not any further: the change to require at least one digit was only introduced for Python 3.11. Fixes #101037.
-rw-r--r--Include/cpython/longintrepr.h3
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2023-01-14-17-03-08.gh-issue-101037.9ATNuf.rst2
-rw-r--r--Objects/longobject.c5
3 files changed, 10 insertions, 0 deletions
diff --git a/Include/cpython/longintrepr.h b/Include/cpython/longintrepr.h
index 68dbf9c..6d52427 100644
--- a/Include/cpython/longintrepr.h
+++ b/Include/cpython/longintrepr.h
@@ -71,6 +71,9 @@ typedef long stwodigits; /* signed variant of twodigits */
0 <= ob_digit[i] <= MASK.
The allocation function takes care of allocating extra memory
so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
+ We always allocate memory for at least one digit, so accessing ob_digit[0]
+ is always safe. However, in the case ob_size == 0, the contents of
+ ob_digit[0] may be undefined.
CAUTION: Generic code manipulating subtypes of PyVarObject has to
aware that ints abuse ob_size's sign bit.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-01-14-17-03-08.gh-issue-101037.9ATNuf.rst b/Misc/NEWS.d/next/Core and Builtins/2023-01-14-17-03-08.gh-issue-101037.9ATNuf.rst
new file mode 100644
index 0000000..a487566
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-01-14-17-03-08.gh-issue-101037.9ATNuf.rst
@@ -0,0 +1,2 @@
+Fix potential memory underallocation issue for instances of :class:`int`
+subclasses with value zero.
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 1db4ca4..51ac869 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -5638,6 +5638,11 @@ long_subtype_new(PyTypeObject *type, PyObject *x, PyObject *obase)
n = Py_SIZE(tmp);
if (n < 0)
n = -n;
+ /* Fast operations for single digit integers (including zero)
+ * assume that there is always at least one digit present. */
+ if (n == 0) {
+ n = 1;
+ }
newobj = (PyLongObject *)type->tp_alloc(type, n);
if (newobj == NULL) {
Py_DECREF(tmp);