From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 18 Sep 2023 17:09:59 +0000 (+0300)
Subject: Fix error handling in _PySys_UpdateConfig() (GH-109524)
X-Git-Tag: v3.13.0a1~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c829975428253568d47ebfc3104fa7386b5e0b58;p=thirdparty%2FPython%2Fcpython.git

Fix error handling in _PySys_UpdateConfig() (GH-109524)
---

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index fed12812a770..9c1ee0215d7c 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -3502,7 +3502,9 @@ _PySys_UpdateConfig(PyThreadState *tstate)
     if (config->pycache_prefix != NULL) {
         SET_SYS_FROM_WSTR("pycache_prefix", config->pycache_prefix);
     } else {
-        PyDict_SetItemString(sysdict, "pycache_prefix", Py_None);
+        if (PyDict_SetItemString(sysdict, "pycache_prefix", Py_None) < 0) {
+            return -1;
+        }
     }
 
     COPY_LIST("argv", config->argv);
@@ -3516,7 +3518,9 @@ _PySys_UpdateConfig(PyThreadState *tstate)
         SET_SYS_FROM_WSTR("_stdlib_dir", stdlibdir);
     }
     else {
-        PyDict_SetItemString(sysdict, "_stdlib_dir", Py_None);
+        if (PyDict_SetItemString(sysdict, "_stdlib_dir", Py_None) < 0) {
+            return -1;
+        }
     }
 
 #undef SET_SYS_FROM_WSTR
@@ -3526,6 +3530,9 @@ _PySys_UpdateConfig(PyThreadState *tstate)
     // sys.flags
     PyObject *flags = _PySys_GetObject(interp, "flags"); // borrowed ref
     if (flags == NULL) {
+        if (!_PyErr_Occurred(tstate)) {
+            _PyErr_SetString(tstate, PyExc_RuntimeError, "lost sys.flags");
+        }
         return -1;
     }
     if (set_flags_from_config(interp, flags) < 0) {