From 4371c0a9c0848f7a0947d43f26f234842b41efdf Mon Sep 17 00:00:00 2001 From: tjb900 Date: Mon, 18 Feb 2019 23:30:51 +0800 Subject: bpo-34572: change _pickle unpickling to use import rather than retrieving from sys.modules (GH-9047) Fix C implementation of pickle.loads to use importlib's locking mechanisms, and thereby avoid using partially-loaded modules. --- Modules/_pickle.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Modules') diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 58cd09ca61..2b97294e1e 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -6636,13 +6636,13 @@ _pickle_Unpickler_find_class_impl(UnpicklerObject *self, } } - module = PyImport_GetModule(module_name); + /* + * we don't use PyImport_GetModule here, because it can return partially- + * initialised modules, which then cause the getattribute to fail. + */ + module = PyImport_Import(module_name); if (module == NULL) { - if (PyErr_Occurred()) - return NULL; - module = PyImport_Import(module_name); - if (module == NULL) - return NULL; + return NULL; } global = getattribute(module, global_name, self->proto >= 4); Py_DECREF(module); -- cgit v1.2.1