Skip to content

[3.13] GH-117195: Avoid assertion error in object.__sizeof__ (GH-117220) #119456

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.

Sign up for GitHub

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

Merged
markshannon merged 1 commit into from
May 23, 2024
Merged

[3.13] GH-117195: Avoid assertion error in object.__sizeof__ (GH-117220) #119456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
GH-117195: Avoid assertion error in object.__sizeof__ (GH-117220) 
(cherry picked from commit 406ffb5)

Co-authored-by: Mark Shannon <mark@hotpy.org>
  • Loading branch information
@markshannon @miss-islington
markshannon authored and miss-islington committed May 23, 2024
commit 465e366839377f3d3c0dda701d76f2c9b8461223
2 changes: 2 additions & 0 deletions Lib/test/test_long.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,6 +1639,8 @@ class MyInt(int):
MyInt.__basicsize__ + MyInt.__itemsize__ * ndigits
)

# GH-117195 -- This shouldn't crash
object.__sizeof__(1)

if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-03-25-15-07-01.gh-issue-117195.OWakgD.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Avoid assertion failure for debug builds when calling
``object.__sizeof__(1)``
7 changes: 5 additions & 2 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down