https://github.com/python/cpython/commit/05e0b67a43c5c1778dc2643c8b7c12864e135999
commit: 05e0b67a43c5c1778dc2643c8b7c12864e135999
branch: main
author: Erlend E. Aasland <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-03-29T21:23:28+01:00
summary:
gh-116664: In _warnings.c, make filters_version access thread-safe (#117374)
- assert that the lock is held in already_warned()
- protect 'filters_version' increment in warnings_filters_mutated_impl()
files:
M Python/_warnings.c
diff --git a/Python/_warnings.c b/Python/_warnings.c
index ac3d3cc2d1246b..4c520252aa12a8 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -398,9 +398,9 @@ already_warned(PyInterpreterState *interp, PyObject
*registry, PyObject *key,
return -1;
WarningsState *st = warnings_get_state(interp);
- if (st == NULL) {
- return -1;
- }
+ assert(st != NULL);
+ _Py_CRITICAL_SECTION_ASSERT_MUTEX_LOCKED(&st->mutex);
+
PyObject *version_obj;
if (PyDict_GetItemRef(registry, &_Py_ID(version), &version_obj) < 0) {
return -1;
@@ -1177,11 +1177,14 @@ warnings_filters_mutated_impl(PyObject *module)
if (interp == NULL) {
return NULL;
}
+
WarningsState *st = warnings_get_state(interp);
- if (st == NULL) {
- return NULL;
- }
+ assert(st != NULL);
+
+ Py_BEGIN_CRITICAL_SECTION_MUT(&st->mutex);
st->filters_version++;
+ Py_END_CRITICAL_SECTION();
+
Py_RETURN_NONE;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
