Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.12] gh-105375: Improve errnomodule error handling (#105590) (#105596)

Browse source 
(cherry picked from commit eede1d2f48)

Bail immediately if an exception is set, to prevent exceptions from
being overwritten.
This commit is contained in:
Erlend E. Aasland 2023-06-09 22:36:53 +02:00 • committed by GitHub
parent 04b76ece7f
commit e0087df65d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2023-06-09-21-04-39.gh-issue-105375.bTcqS9.rst Normal file
View file

@ -0,0 +1 @@
Fix bugs in :mod:`pickle` where exceptions could be overwritten.

7
Modules/errnomodule.c
View file

@ -81,9 +81,12 @@ _add_errcode(PyObject *module_dict, PyObject *error_dict, const char *name_str,
static int
errno_exec(PyObject *module)
{
PyObject *module_dict = PyModule_GetDict(module);
PyObject *module_dict = PyModule_GetDict(module); // Borrowed ref.
if (module_dict == NULL) {
return -1;
}
PyObject *error_dict = PyDict_New();
if (!module_dict || !error_dict) {
if (error_dict == NULL) {
return -1;
}
if (PyDict_SetItemString(module_dict, "errorcode", error_dict) < 0) {