From 7336a77a0f7dcb73cdb26ff08115c15d676d153a Mon Sep 17 00:00:00 2001 From: xiejunyi Date: Mon, 22 Mar 2021 21:33:56 +0800 Subject: [PATCH] fix codecs.c static variables under building under building Python with --with-experimental-isolated-subinterpreters may cause crash --- Python/codecs.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Python/codecs.c b/Python/codecs.c index fa329ce2436427..d1844ca017e7c3 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -954,8 +954,6 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc) return Py_BuildValue("(Nn)", res, end); } -static _PyUnicode_Name_CAPI *ucnhash_capi = NULL; - PyObject *PyCodec_NameReplaceErrors(PyObject *exc) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) { @@ -976,13 +974,11 @@ PyObject *PyCodec_NameReplaceErrors(PyObject *exc) return NULL; if (!(object = PyUnicodeEncodeError_GetObject(exc))) return NULL; + /* load the unicode data module */ + _PyUnicode_Name_CAPI *ucnhash_capi = (_PyUnicode_Name_CAPI *)PyCapsule_Import( + PyUnicodeData_CAPSULE_NAME, 1); if (!ucnhash_capi) { - /* load the unicode data module */ - ucnhash_capi = (_PyUnicode_Name_CAPI *)PyCapsule_Import( - PyUnicodeData_CAPSULE_NAME, 1); - if (!ucnhash_capi) { - return NULL; - } + return NULL; } for (i = start, ressize = 0; i < end; ++i) { /* object is guaranteed to be "ready" */