From: Ramin Farajpour Cami Date: Mon, 9 Mar 2026 16:41:39 +0000 (+0330) Subject: [3.14] gh-145623: Fix crashes on uninitialized struct.Struct objects (gh-145624)... X-Git-Tag: v3.14.4~186 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c624d4f315890a9f25c492908f1f58ffb9d1255;p=thirdparty%2FPython%2Fcpython.git [3.14] gh-145623: Fix crashes on uninitialized struct.Struct objects (gh-145624) (GH-145630) --- diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 2b8d19ac9664..4a7706ff4320 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -836,6 +836,8 @@ class StructTest(ComplexesAreIdenticalMixin, unittest.TestCase): self.assertRaises(RuntimeError, S.unpack, spam) self.assertRaises(RuntimeError, S.unpack_from, spam) self.assertRaises(RuntimeError, getattr, S, 'format') + self.assertRaises(RuntimeError, S.__sizeof__) + self.assertRaises(RuntimeError, repr, S) self.assertEqual(S.size, -1) diff --git a/Misc/NEWS.d/next/Library/2026-03-07-15-00-00.gh-issue-145623.2Y7LzT.rst b/Misc/NEWS.d/next/Library/2026-03-07-15-00-00.gh-issue-145623.2Y7LzT.rst new file mode 100644 index 000000000000..77b43e79e358 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-03-07-15-00-00.gh-issue-145623.2Y7LzT.rst @@ -0,0 +1,3 @@ +Fix crash in :mod:`struct` when calling :func:`repr` or +``__sizeof__()`` on an uninitialized :class:`struct.Struct` +object created via ``Struct.__new__()`` without calling ``__init__()``. diff --git a/Modules/_struct.c b/Modules/_struct.c index 61d3ab0d7a47..0ed1c517aed6 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -2410,6 +2410,7 @@ static PyObject * s_sizeof(PyObject *op, PyObject *Py_UNUSED(dummy)) { PyStructObject *self = PyStructObject_CAST(op); + ENSURE_STRUCT_IS_READY(self); size_t size = _PyObject_SIZE(Py_TYPE(self)) + sizeof(formatcode); for (formatcode *code = self->s_codes; code->fmtdef != NULL; code++) { size += sizeof(formatcode); @@ -2421,6 +2422,7 @@ static PyObject * s_repr(PyObject *op) { PyStructObject *self = PyStructObject_CAST(op); + ENSURE_STRUCT_IS_READY(self); PyObject* fmt = PyUnicode_FromStringAndSize( PyBytes_AS_STRING(self->s_format), PyBytes_GET_SIZE(self->s_format)); if (fmt == NULL) {