mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-21 16:10:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

gh-129107: fix thread safety of bytearray where two critical sections are needed (#130227)

Browse source
This commit is contained in:
Tomasz Pytel 2025-02-27 09:59:58 -05:00 • committed by GitHub
parent 8ba0d7bbc2
commit e85f81f430
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_bytes.py
View file

@ -2380,12 +2380,22 @@ class FreeThreadingTest(unittest.TestCase):
b.wait() b.wait()
a[:] = c a[:] = c
def ass_subscript2(b, a, c): # MODIFIES!
b.wait()
a[:] = c
assert b'\xdd' not in a
def mod(b, a): def mod(b, a):
c = tuple(range(4096)) c = tuple(range(4096))
b.wait() b.wait()
try: a % c try: a % c
except TypeError: pass except TypeError: pass
def mod2(b, a, c):
b.wait()
d = a % c
assert b'\xdd' not in d
def repr_(b, a): def repr_(b, a):
b.wait() b.wait()
repr(a) repr(a)
@ -2503,7 +2513,9 @@ class FreeThreadingTest(unittest.TestCase):
check([clear] + [contains] * 10) check([clear] + [contains] * 10)
check([clear] + [subscript] * 10) check([clear] + [subscript] * 10)
check([clear2] + [ass_subscript2] * 10, None, bytearray(b'0' * 0x400000))
check([clear] + [mod] * 10, bytearray(b'%d' * 4096)) check([clear] + [mod] * 10, bytearray(b'%d' * 4096))
check([clear2] + [mod2] * 10, bytearray(b'%s'), bytearray(b'0' * 0x400000))
check([clear] + [capitalize] * 10, bytearray(b'a' * 0x40000)) check([clear] + [capitalize] * 10, bytearray(b'a' * 0x40000))
check([clear] + [center] * 10, bytearray(b'a' * 0x40000)) check([clear] + [center] * 10, bytearray(b'a' * 0x40000))

1
Misc/NEWS.d/next/Core_and_Builtins/2025-02-17-15-32-26.gh-issue-129107.fPPBLw.rst Normal file
View file

@ -0,0 +1 @@
Fix two more :class:`bytearray` functions for :term:`free threading`.

26
Objects/bytearrayobject.c
View file

@ -864,9 +864,16 @@ static int
bytearray_ass_subscript(PyObject *op, PyObject *index, PyObject *values) bytearray_ass_subscript(PyObject *op, PyObject *index, PyObject *values)
{ {
int ret; int ret;
Py_BEGIN_CRITICAL_SECTION(op); if (values != NULL && PyByteArray_Check(values)) {
ret = bytearray_ass_subscript_lock_held(op, index, values); Py_BEGIN_CRITICAL_SECTION2(op, values);
Py_END_CRITICAL_SECTION(); ret = bytearray_ass_subscript_lock_held(op, index, values);
Py_END_CRITICAL_SECTION2();
}
else {
Py_BEGIN_CRITICAL_SECTION(op);
ret = bytearray_ass_subscript_lock_held(op, index, values);
Py_END_CRITICAL_SECTION();
}
return ret; return ret;
} }
@ -2751,9 +2758,16 @@ static PyObject *
bytearray_mod(PyObject *v, PyObject *w) bytearray_mod(PyObject *v, PyObject *w)
{ {
PyObject *ret; PyObject *ret;
Py_BEGIN_CRITICAL_SECTION(v); if (PyByteArray_Check(w)) {
ret = bytearray_mod_lock_held(v, w); Py_BEGIN_CRITICAL_SECTION2(v, w);
Py_END_CRITICAL_SECTION(); ret = bytearray_mod_lock_held(v, w);
Py_END_CRITICAL_SECTION2();
}
else {
Py_BEGIN_CRITICAL_SECTION(v);
ret = bytearray_mod_lock_held(v, w);
Py_END_CRITICAL_SECTION();
}
return ret; return ret;
} }