From: Kumar Aditya Date: Wed, 12 Feb 2025 13:33:56 +0000 (+0530) Subject: [3.13] gh-129983: fix data race in compile_template in sre.c (#130038) X-Git-Tag: v3.13.3~282 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cb251d06ffef2b4569fa2d08c0561525a6d01d6;p=thirdparty%2FPython%2Fcpython.git [3.13] gh-129983: fix data race in compile_template in sre.c (#130038) gh-129983: fix data race in compile_template in sre.c (#130015) (cherry picked from commit 3cf68cdd3e1809df4e426c61f6990de63747ec6f) Co-authored-by: Tomasz Pytel --- 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 000000000000..9b435703eb73 --- /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 7fbb59ef89ab..608a0ccb1153 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};