Skip to content

[2.7] bpo-34110: Fix module load problem of cPickle in case of multithreading #8276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sangongs wants to merge 1 commit into from
Closed

[2.7] bpo-34110: Fix module load problem of cPickle in case of multithreading #8276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-07-13-15-08-12.bpo-34110.0vn18S.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix module load problem of cPickle in case of multithreading. Patch by
Guoqiang Zhang.
8 changes: 8 additions & 0 deletions Modules/cPickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3365,7 +3365,15 @@ find_class(PyObject *py_module_name, PyObject *py_global_name, PyObject *fc)
if (module == NULL)
return NULL;

_PyImport_AcquireLock();
module = PyDict_GetItem(module, py_module_name);
if (_PyImport_ReleaseLock() < 0) {
Py_XDECREF(module);
PyErr_SetString(PyExc_RuntimeError,
"not holding the import lock");
return NULL;
}

if (module == NULL) {
module = PyImport_Import(py_module_name);
if (!module)
Expand Down