mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-111971: Make _PyUnicode_FromId thread-safe in --disable-gil (gh-113489)

Browse source
This commit is contained in:
Donghee Na 2023-12-26 16:48:33 +00:00 • committed by GitHub
parent 36adc79041
commit 8f5b998706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -1897,6 +1897,7 @@ PyUnicode_FromString(const char *u)
PyObject *
_PyUnicode_FromId(_Py_Identifier *id)
{
PyMutex_Lock((PyMutex *)&id->mutex);
PyInterpreterState *interp = _PyInterpreterState_GET();
struct _Py_unicode_ids *ids = &interp->unicode.ids;
@ -1923,14 +1924,14 @@ _PyUnicode_FromId(_Py_Identifier *id)
obj = ids->array[index];
if (obj) {
// Return a borrowed reference
return obj;
goto end;
}
}
obj = PyUnicode_DecodeUTF8Stateful(id->string, strlen(id->string),
NULL, NULL);
if (!obj) {
return NULL;
goto end;
}
PyUnicode_InternInPlace(&obj);
@ -1941,7 +1942,8 @@ _PyUnicode_FromId(_Py_Identifier *id)
PyObject **new_array = PyMem_Realloc(ids->array, new_size * item_size);
if (new_array == NULL) {
PyErr_NoMemory();
return NULL;
obj = NULL;
goto end;
}
memset(&new_array[ids->size], 0, (new_size - ids->size) * item_size);
ids->array = new_array;
@ -1951,6 +1953,8 @@ _PyUnicode_FromId(_Py_Identifier *id)
// The array stores a strong reference
ids->array[index] = obj;
end:
PyMutex_Unlock((PyMutex *)&id->mutex);
// Return a borrowed reference
return obj;
}