[Python-checkins] [3.11] gh-105375: Improve _pickle error handling (#105475) (#105583)

[erlend-aasland]

https://github.com/python/cpython/commit/4d4251d6eca0acd0761e0b75633a297cf20a30c0
commit: 4d4251d6eca0acd0761e0b75633a297cf20a30c0
branch: 3.11
author: Erlend E. Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2023-06-09T17:56:02Z
summary:

[3.11] gh-105375: Improve _pickle error handling (#105475) (#105583)

(cherry picked from commit 89aac6f6b7b3af046ec137121c90732289e79efc)

Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.

files:
A Misc/NEWS.d/next/Library/2023-06-08-08-58-36.gh-issue-105375.bTcqS9.rst
M Modules/_pickle.c

diff --git a/Misc/NEWS.d/next/Library/2023-06-08-08-58-36.gh-issue-105375.bTcqS9.rst b/Misc/NEWS.d/next/Library/2023-06-08-08-58-36.gh-issue-105375.bTcqS9.rst
new file mode 100644
index 0000000000000..3030477c8245b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-06-08-08-58-36.gh-issue-105375.bTcqS9.rst
@@ -0,0 +1 @@
+Fix bugs in :mod:`pickle` where exceptions could be overwritten.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 721079c91f5f2..ddabc201a59f8 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1139,10 +1139,13 @@ _Pickler_New(void)
     self->reducer_override = NULL;
 
     self->memo = PyMemoTable_New();
+    if (self->memo == NULL) {
+        Py_DECREF(self);
+        return NULL;
+    }
     self->output_buffer = PyBytes_FromStringAndSize(NULL,
                                                     self->max_output_len);
-
-    if (self->memo == NULL || self->output_buffer == NULL) {
+    if (self->output_buffer == NULL) {
         Py_DECREF(self);
         return NULL;
     }
@@ -1627,9 +1630,12 @@ _Unpickler_New(void)
     self->memo_size = 32;
     self->memo_len = 0;
     self->memo = _Unpickler_NewMemo(self->memo_size);
+    if (self->memo == NULL) {
+        Py_DECREF(self);
+        return NULL;
+    }
     self->stack = (Pdata *)Pdata_New();
-
-    if (self->memo == NULL || self->stack == NULL) {
+    if (self->stack == NULL) {
         Py_DECREF(self);
         return NULL;
     }
@@ -4833,11 +4839,12 @@ _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self)
             PyObject *key, *value;
 
             key = PyLong_FromVoidPtr(entry.me_key);
+            if (key == NULL) {
+                goto error;
+            }
             value = Py_BuildValue("nO", entry.me_value, entry.me_key);
-
-            if (key == NULL || value == NULL) {
-                Py_XDECREF(key);
-                Py_XDECREF(value);
+            if (value == NULL) {
+                Py_DECREF(key);
                 goto error;
             }
             status = PyDict_SetItem(new_memo, key, value);
@@ -6033,13 +6040,21 @@ load_stack_global(UnpicklerObject *self)
     PyObject *global_name;
 
     PDATA_POP(self->stack, global_name);
+    if (global_name == NULL) {
+        return -1;
+    }
     PDATA_POP(self->stack, module_name);
-    if (module_name == NULL || !PyUnicode_CheckExact(module_name) ||
-        global_name == NULL || !PyUnicode_CheckExact(global_name)) {
+    if (module_name == NULL) {
+        Py_DECREF(global_name);
+        return -1;
+    }
+    if (!PyUnicode_CheckExact(module_name) ||
+        !PyUnicode_CheckExact(global_name))
+    {
         PickleState *st = _Pickle_GetGlobalState();
         PyErr_SetString(st->UnpicklingError, "STACK_GLOBAL requires str");
-        Py_XDECREF(global_name);
-        Py_XDECREF(module_name);
+        Py_DECREF(global_name);
+        Py_DECREF(module_name);
         return -1;
     }
     global = find_class(self, module_name, global_name);