mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source
This commit is contained in:
Serhiy Storchaka 2023-09-18 20:09:59 +03:00 • committed by GitHub
parent 74f315edd0
commit c829975428
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/sysmodule.c
View file

@ -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) {