Visitar URL original
gh-78724: raise RuntimeError's when calling methods on non-ready Struct()'s by skirpichev · Pull Request #143643 · python/cpython · GitHub
Skip to content

gh-78724: raise RuntimeError's when calling methods on non-ready Struct()'s #143643

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
serhiy-storchaka merged 14 commits into from
Jan 11, 2026
+31 −8
Merged

gh-78724: raise RuntimeError's when calling methods on non-ready Struct()'s #143643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a1c2603
gh-143379: fix UAF in struct.Struct.pack() when object modified by du…
skirpichev Jan 3, 2026
716e28c
Merge branch 'master' into fix-uaf-s_pack_internal/143379
skirpichev Jan 10, 2026
e611953
address review: implement a different solution with a mutex flag
skirpichev Jan 10, 2026
ab62167
+ clean the mess
skirpichev Jan 10, 2026
3b18427
gh-78724: raise RuntimeError's when calling methods on non-ready Stru…
skirpichev Jan 10, 2026
54dbea8
Merge branch 'master' into deprecate-struct-init/78724
skirpichev Jan 10, 2026
b6c8bed
revert stuff from #143382
skirpichev Jan 10, 2026
f542173
revert deprecations (TBD: a separate pr)
skirpichev Jan 10, 2026
69a5eec
address review: redo patch to use s_codes
skirpichev Jan 10, 2026
0e6af95
Merge branch 'main' into deprecate-struct-init/78724
skirpichev Jan 10, 2026
8ba6b33
address review: -asserts + redo test
skirpichev Jan 10, 2026
ea0f8e2
address review: adjust tests
skirpichev Jan 10, 2026
c71be45
Merge branch 'master' into deprecate-struct-init/78724
skirpichev Jan 11, 2026
b61bddb
address review: revert unrelated change
skirpichev Jan 11, 2026
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
Prev Previous commit
Next Next commit
revert deprecations (TBD: a separate pr)
  • Loading branch information
@skirpichev
skirpichev committed Jan 10, 2026
commit f542173235a32e8d9dadc84b7ca7bc2af2f9a585
13 changes: 3 additions & 10 deletions Lib/test/test_struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import unittest
import struct
import sys
import warnings
import weakref

from test import support
Expand Down Expand Up @@ -576,11 +575,7 @@ def test_Struct_reinitialization(self):
# Struct instance. This test can be used to detect the leak
# when running with regrtest -L.
s = struct.Struct('i')
with self.assertWarns(DeprecationWarning):
s.__init__('ii')
with warnings.catch_warnings():
warnings.simplefilter("error", DeprecationWarning)
self.assertRaises(DeprecationWarning, s.__init__, 'ii')
s.__init__('ii')

def check_sizeof(self, format_str, number_of_codes):
# The size of 'PyStructObject'
Expand Down Expand Up @@ -788,8 +783,7 @@ class MyStruct(struct.Struct):
def __init__(self):
super().__init__('>h')

with self.assertWarns(DeprecationWarning):
my_struct = MyStruct()
my_struct = MyStruct()
self.assertEqual(my_struct.pack(12345), b'\x30\x39')

def test_repr(self):
Expand Down Expand Up @@ -823,8 +817,7 @@ def test_endian_table_init_subinterpreters(self):
self.assertListEqual(list(results), [None] * 5)

def test_operations_on_half_initialized_Struct(self):
with self.assertWarns(DeprecationWarning):
S = struct.Struct.__new__(struct.Struct)
S = struct.Struct.__new__(struct.Struct)

spam = array.array('b', b' ')
for attr in ['iter_unpack', 'pack', 'pack_into',
Expand Down
13 changes: 0 additions & 13 deletions Modules/_struct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,12 +1763,6 @@ s_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *self;

if (PyTuple_GET_SIZE(args) != 1
&& PyErr_WarnEx(PyExc_DeprecationWarning,
"Struct().__new__() has one required argument", 1))
{
return NULL;
}
assert(type != NULL);
allocfunc alloc_func = PyType_GetSlot(type, Py_tp_alloc);
assert(alloc_func != NULL);
Expand Down Expand Up @@ -1802,13 +1796,6 @@ static int
Struct___init___impl(PyStructObject *self, PyObject *format)
/*[clinic end generated code: output=b8e80862444e92d0 input=192a4575a3dde802]*/
{
if (self->ready
&& PyErr_WarnEx(PyExc_DeprecationWarning,
("Explicit call of __init__() on "
"initialized Struct()"), 1))
{
return -1;
}
if (PyUnicode_Check(format)) {
format = PyUnicode_AsASCIIString(format);
if (format == NULL)
Expand Down