summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-05-23 15:58:34 (GMT)
committerGitHub <noreply@github.com>2024-05-23 15:58:34 (GMT)
commit251ef2e36f61a1c4b7c628ba9dc38a10a355a058 (patch)
tree18d6c2bc1c11eb969fc3216b549feb2d67f78b1a
parentdbe4f8a2e8b9751bbe8d0551e55d27267b0bfcde (diff)
downloadcpython-251ef2e36f61a1c4b7c628ba9dc38a10a355a058.zip
cpython-251ef2e36f61a1c4b7c628ba9dc38a10a355a058.tar.gz
cpython-251ef2e36f61a1c4b7c628ba9dc38a10a355a058.tar.bz2
[3.13] GH-117195: Avoid assertion error in `object.__sizeof__` (GH-117220) (GH-119456)
-rw-r--r--Lib/test/test_long.py2
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2024-03-25-15-07-01.gh-issue-117195.OWakgD.rst2
-rw-r--r--Objects/typeobject.c7
3 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index d299c34..41b973d 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -1639,6 +1639,8 @@ class LongTest(unittest.TestCase):
MyInt.__basicsize__ + MyInt.__itemsize__ * ndigits
)
+ # GH-117195 -- This shouldn't crash
+ object.__sizeof__(1)
if __name__ == "__main__":
unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-03-25-15-07-01.gh-issue-117195.OWakgD.rst b/Misc/NEWS.d/next/Core and Builtins/2024-03-25-15-07-01.gh-issue-117195.OWakgD.rst
new file mode 100644
index 0000000..ae1e5ac
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-03-25-15-07-01.gh-issue-117195.OWakgD.rst
@@ -0,0 +1,2 @@
+Avoid assertion failure for debug builds when calling
+``object.__sizeof__(1)``
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b7c3fcf..4af4971 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -7037,8 +7037,11 @@ object___sizeof___impl(PyObject *self)
res = 0;
isize = Py_TYPE(self)->tp_itemsize;
- if (isize > 0)
- res = Py_SIZE(self) * isize;
+ if (isize > 0) {
+ /* This assumes that ob_size is valid if tp_itemsize is not 0,
+ which isn't true for PyLongObject. */
+ res = _PyVarObject_CAST(self)->ob_size * isize;
+ }
res += Py_TYPE(self)->tp_basicsize;
return PyLong_FromSsize_t(res);