From: Erlend E. Aasland <erlend.aasland@protonmail.com>
Date: Fri, 9 Jun 2023 20:36:53 +0000 (+0200)
Subject: [3.12] gh-105375: Improve errnomodule error handling (#105590) (#105596)
X-Git-Tag: v3.12.0b3~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0087df65df485478401aec321b22e2f92407cd3;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit eede1d2f48b4fe7f7918952d9ebeb744b58668c1)

Bail immediately if an exception is set, to prevent exceptions from
being overwritten.
---

diff --git a/Misc/NEWS.d/next/Library/2023-06-09-21-04-39.gh-issue-105375.bTcqS9.rst b/Misc/NEWS.d/next/Library/2023-06-09-21-04-39.gh-issue-105375.bTcqS9.rst
new file mode 100644
index 000000000000..3030477c8245
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-06-09-21-04-39.gh-issue-105375.bTcqS9.rst
@@ -0,0 +1 @@
+Fix bugs in :mod:`pickle` where exceptions could be overwritten.
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
index fddde960a5fe..301ad8313bc5 100644
--- a/Modules/errnomodule.c
+++ b/Modules/errnomodule.c
@@ -81,9 +81,12 @@ end:
 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) {