]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.14] gh-145623: Fix crashes on uninitialized struct.Struct objects (gh-145624)...
authorRamin Farajpour Cami <ramin.blackhat@gmail.com>
Mon, 9 Mar 2026 16:41:39 +0000 (20:11 +0330)
committerGitHub <noreply@github.com>
Mon, 9 Mar 2026 16:41:39 +0000 (17:41 +0100)
Lib/test/test_struct.py
Misc/NEWS.d/next/Library/2026-03-07-15-00-00.gh-issue-145623.2Y7LzT.rst [new file with mode: 0644]
Modules/_struct.c

index 2b8d19ac966444ea0b24e14fb31f075085f403b6..4a7706ff4320cb685184bef12f3c7f68c32a42aa 100644 (file)
@@ -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 (file)
index 0000000..77b43e7
--- /dev/null
@@ -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__()``.
index 61d3ab0d7a474c516f749c5006f585d9dd20870e..0ed1c517aed67d03017bd8656f9eec7d8fc0464f 100644 (file)
@@ -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) {