mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 02:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.12] Fix error handling in _PySys_UpdateConfig() (GH-109524) (#109550)

Browse source 
Fix error handling in _PySys_UpdateConfig() (GH-109524)
(cherry picked from commit c829975428)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-10-02 07:58:58 -07:00 • committed by GitHub
parent e5c860f9d0
commit df2cdcf22f
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

@ -3466,7 +3466,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);
@ -3480,7 +3482,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
@ -3490,6 +3494,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) {