mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-38858: _PyImport_FixupExtensionObject() handles subinterpreters (GH-17350)

Browse source 
If _PyImport_FixupExtensionObject() is called from a subinterpreter,
leave extensions unchanged and don't copy the module dictionary
into def->m_base.m_copy.
This commit is contained in:
Victor Stinner 2019-11-22 18:52:27 +01:00 • committed by GitHub
parent 42bc60ead3
commit 82c83bd907
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 70 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Include/cpython/pystate.h
View file

@ -147,7 +147,6 @@ struct _ts {
The caller must hold the GIL.*/ The caller must hold the GIL.*/
PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void); PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void);
PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
/* Similar to PyThreadState_Get(), but don't issue a fatal error /* Similar to PyThreadState_Get(), but don't issue a fatal error

6
Include/internal/pycore_pystate.h
View file

@ -324,6 +324,12 @@ extern void _PyInterpreterState_ClearModules(PyInterpreterState *interp);
PyAPI_FUNC(void) _PyGILState_Reinit(_PyRuntimeState *runtime); PyAPI_FUNC(void) _PyGILState_Reinit(_PyRuntimeState *runtime);
PyAPI_FUNC(int) _PyState_AddModule(
PyThreadState *tstate,
PyObject* module,
struct PyModuleDef* def);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

54
Python/import.c
View file

@ -695,29 +695,27 @@ int
_PyImport_FixupExtensionObject(PyObject *mod, PyObject *name, _PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
PyObject *filename, PyObject *modules) PyObject *filename, PyObject *modules)
{ {
PyObject *dict, *key;
struct PyModuleDef *def;
int res;
if (extensions == NULL) {
extensions = PyDict_New();
if (extensions == NULL)
return -1;
}
if (mod == NULL || !PyModule_Check(mod)) { if (mod == NULL || !PyModule_Check(mod)) {
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
def = PyModule_GetDef(mod);
struct PyModuleDef *def = PyModule_GetDef(mod);
if (!def) { if (!def) {
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
if (PyObject_SetItem(modules, name, mod) < 0)
PyThreadState *tstate = _PyThreadState_GET();
if (PyObject_SetItem(modules, name, mod) < 0) {
return -1; return -1;
if (_PyState_AddModule(mod, def) < 0) { }
if (_PyState_AddModule(tstate, mod, def) < 0) {
PyMapping_DelItem(modules, name); PyMapping_DelItem(modules, name);
return -1; return -1;
} }
if (_Py_IsMainInterpreter(tstate)) {
if (def->m_size == -1) { if (def->m_size == -1) {
if (def->m_base.m_copy) { if (def->m_base.m_copy) {
/* Somebody already imported the module, /* Somebody already imported the module,
@ -725,20 +723,34 @@ _PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
XXX this should really not happen. */ XXX this should really not happen. */
Py_CLEAR(def->m_base.m_copy); Py_CLEAR(def->m_base.m_copy);
} }
dict = PyModule_GetDict(mod); PyObject *dict = PyModule_GetDict(mod);
if (dict == NULL) if (dict == NULL) {
return -1;
def->m_base.m_copy = PyDict_Copy(dict);
if (def->m_base.m_copy == NULL)
return -1; return -1;
} }
key = PyTuple_Pack(2, filename, name); def->m_base.m_copy = PyDict_Copy(dict);
if (key == NULL) if (def->m_base.m_copy == NULL) {
return -1; return -1;
res = PyDict_SetItem(extensions, key, (PyObject *)def); }
}
if (extensions == NULL) {
extensions = PyDict_New();
if (extensions == NULL) {
return -1;
}
}
PyObject *key = PyTuple_Pack(2, filename, name);
if (key == NULL) {
return -1;
}
int res = PyDict_SetItem(extensions, key, (PyObject *)def);
Py_DECREF(key); Py_DECREF(key);
if (res < 0) if (res < 0) {
return -1; return -1;
}
}
return 0; return 0;
} }
@ -801,7 +813,7 @@ import_find_extension(PyThreadState *tstate, PyObject *name,
} }
Py_DECREF(mod); Py_DECREF(mod);
} }
if (_PyState_AddModule(mod, def) < 0) { if (_PyState_AddModule(tstate, mod, def) < 0) {
PyMapping_DelItem(modules, name); PyMapping_DelItem(modules, name);
return NULL; return NULL;
} }

39
Python/pystate.c
View file

@ -661,9 +661,8 @@ PyState_FindModule(struct PyModuleDef* module)
} }
int int
_PyState_AddModule(PyObject* module, struct PyModuleDef* def) _PyState_AddModule(PyThreadState *tstate, PyObject* module, struct PyModuleDef* def)
{ {
PyInterpreterState *state;
if (!def) { if (!def) {
assert(PyErr_Occurred()); assert(PyErr_Occurred());
return -1; return -1;
@ -673,37 +672,45 @@ _PyState_AddModule(PyObject* module, struct PyModuleDef* def)
"PyState_AddModule called on module with slots"); "PyState_AddModule called on module with slots");
return -1; return -1;
} }
state = _PyInterpreterState_GET_UNSAFE();
if (!state->modules_by_index) { PyInterpreterState *interp = tstate->interp;
state->modules_by_index = PyList_New(0); if (!interp->modules_by_index) {
if (!state->modules_by_index) interp->modules_by_index = PyList_New(0);
if (!interp->modules_by_index) {
return -1; return -1;
} }
while (PyList_GET_SIZE(state->modules_by_index) <= def->m_base.m_index) }
if (PyList_Append(state->modules_by_index, Py_None) < 0)
while (PyList_GET_SIZE(interp->modules_by_index) <= def->m_base.m_index) {
if (PyList_Append(interp->modules_by_index, Py_None) < 0) {
return -1; return -1;
}
}
Py_INCREF(module); Py_INCREF(module);
return PyList_SetItem(state->modules_by_index, return PyList_SetItem(interp->modules_by_index,
def->m_base.m_index, module); def->m_base.m_index, module);
} }
int int
PyState_AddModule(PyObject* module, struct PyModuleDef* def) PyState_AddModule(PyObject* module, struct PyModuleDef* def)
{ {
Py_ssize_t index;
PyInterpreterState *state = _PyInterpreterState_GET_UNSAFE();
if (!def) { if (!def) {
Py_FatalError("PyState_AddModule: Module Definition is NULL"); Py_FatalError("PyState_AddModule: Module Definition is NULL");
return -1; return -1;
} }
index = def->m_base.m_index;
if (state->modules_by_index && PyThreadState *tstate = _PyThreadState_GET();
index < PyList_GET_SIZE(state->modules_by_index) && PyInterpreterState *interp = tstate->interp;
module == PyList_GET_ITEM(state->modules_by_index, index)) { Py_ssize_t index = def->m_base.m_index;
if (interp->modules_by_index &&
index < PyList_GET_SIZE(interp->modules_by_index) &&
module == PyList_GET_ITEM(interp->modules_by_index, index))
{
Py_FatalError("PyState_AddModule: Module already added!"); Py_FatalError("PyState_AddModule: Module already added!");
return -1; return -1;
} }
return _PyState_AddModule(module, def); return _PyState_AddModule(tstate, module, def);
} }
int int