Issue #18408: handle PySys_GetObject() failure, raise a RuntimeError
This commit is contained in:
parent
1b63493ed1
commit
1e53bbaced
|
@ -1361,8 +1361,10 @@ whichmodule(PyObject *global, PyObject *global_name)
|
|||
|
||||
search:
|
||||
modules_dict = PySys_GetObject("modules");
|
||||
if (modules_dict == NULL)
|
||||
if (modules_dict == NULL) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "unable to get sys.modules");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
module_name = NULL;
|
||||
|
@ -5542,8 +5544,10 @@ Unpickler_find_class(UnpicklerObject *self, PyObject *args)
|
|||
}
|
||||
|
||||
modules_dict = PySys_GetObject("modules");
|
||||
if (modules_dict == NULL)
|
||||
if (modules_dict == NULL) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "unable to get sys.modules");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
module = PyDict_GetItemWithError(modules_dict, module_name);
|
||||
if (module == NULL) {
|
||||
|
|
|
@ -260,8 +260,10 @@ RunMainFromImporter(wchar_t *filename)
|
|||
/* argv0 is usable as an import source, so put it in sys.path[0]
|
||||
and import __main__ */
|
||||
sys_path = PySys_GetObject("path");
|
||||
if (sys_path == NULL)
|
||||
if (sys_path == NULL) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path");
|
||||
goto error;
|
||||
}
|
||||
if (PyList_SetItem(sys_path, 0, argv0)) {
|
||||
argv0 = NULL;
|
||||
goto error;
|
||||
|
|
|
@ -1550,6 +1550,11 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds)
|
|||
return NULL;
|
||||
if (file == NULL || file == Py_None) {
|
||||
file = PySys_GetObject("stdout");
|
||||
if (file == NULL) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* sys.stdout may be None when FILE* stdout isn't connected */
|
||||
if (file == Py_None)
|
||||
Py_RETURN_NONE;
|
||||
|
|
|
@ -85,8 +85,10 @@ _PyImportZip_Init(void)
|
|||
int err = 0;
|
||||
|
||||
path_hooks = PySys_GetObject("path_hooks");
|
||||
if (path_hooks == NULL)
|
||||
if (path_hooks == NULL) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path_hooks");
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (Py_VerboseFlag)
|
||||
PySys_WriteStderr("# installing zipimport hook\n");
|
||||
|
@ -944,11 +946,11 @@ PyAPI_FUNC(PyObject *)
|
|||
PyImport_GetImporter(PyObject *path) {
|
||||
PyObject *importer=NULL, *path_importer_cache=NULL, *path_hooks=NULL;
|
||||
|
||||
if ((path_importer_cache = PySys_GetObject("path_importer_cache"))) {
|
||||
if ((path_hooks = PySys_GetObject("path_hooks"))) {
|
||||
importer = get_path_importer(path_importer_cache,
|
||||
path_hooks, path);
|
||||
}
|
||||
path_importer_cache = PySys_GetObject("path_importer_cache");
|
||||
path_hooks = PySys_GetObject("path_hooks");
|
||||
if (path_importer_cache != NULL && path_hooks != NULL) {
|
||||
importer = get_path_importer(path_importer_cache,
|
||||
path_hooks, path);
|
||||
}
|
||||
Py_XINCREF(importer); /* get_path_importer returns a borrowed reference */
|
||||
return importer;
|
||||
|
|
Loading…
Reference in New Issue