Issue #18408: handle PySys_GetObject() failure, raise a RuntimeError

2 files changed, 9 insertions, 3 deletions

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index e7d7dd9..4ba185d 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -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) {
diff --git a/Modules/main.c b/Modules/main.c
index 0343dda..e592d8b 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -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;