From 6c54f89d6bf1925f7680cb3d064afc580bb08f80 Mon Sep 17 00:00:00 2001 From: Tomasz Pytel Date: Wed, 12 Feb 2025 08:04:44 -0500 Subject: [PATCH] gh-129983: fix data race in compile_template in sre.c (#130015) (cherry picked from commit 3cf68cdd3e1809df4e426c61f6990de63747ec6f) --- .../2025-02-11-20-38-37.gh-issue-129983._1Fujo.rst | 1 + Modules/_sre/sre.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2025-02-11-20-38-37.gh-issue-129983._1Fujo.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-02-11-20-38-37.gh-issue-129983._1Fujo.rst b/Misc/NEWS.d/next/Core and Builtins/2025-02-11-20-38-37.gh-issue-129983._1Fujo.rst new file mode 100644 index 00000000000000..9b435703eb734a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2025-02-11-20-38-37.gh-issue-129983._1Fujo.rst @@ -0,0 +1 @@ +Fix data race in compile_template in :file:`sre.c`. diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c index 7fbb59ef89abc8..608a0ccb11535c 100644 --- a/Modules/_sre/sre.c +++ b/Modules/_sre/sre.c @@ -1160,13 +1160,21 @@ compile_template(_sremodulestate *module_state, PatternObject *pattern, PyObject *template) { /* delegate to Python code */ - PyObject *func = module_state->compile_template; + PyObject *func = FT_ATOMIC_LOAD_PTR(module_state->compile_template); if (func == NULL) { func = _PyImport_GetModuleAttrString("re", "_compile_template"); if (func == NULL) { return NULL; } +#ifdef Py_GIL_DISABLED + PyObject *other_func = NULL; + if (!_Py_atomic_compare_exchange_ptr(&module_state->compile_template, &other_func, func)) { + Py_DECREF(func); + func = other_func; + } +#else Py_XSETREF(module_state->compile_template, func); +#endif } PyObject *args[] = {(PyObject *)pattern, template};