From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:49:25 +0000 (+0100)
Subject: [3.12] gh-126461: Fix _Unpickler_ReadFromFile() error handling (GH-126485) (#126496)
X-Git-Tag: v3.12.8~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97ab3cf3749085f6f42f38180c40aa88ca1b6355;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-126461: Fix _Unpickler_ReadFromFile() error handling (GH-126485) (#126496)

gh-126461: Fix _Unpickler_ReadFromFile() error handling (GH-126485)

Handle _Unpickler_SetStringInput() failure.
(cherry picked from commit a1c57bcfd2bcbc55ff858407e09c1d8d8cee44e6)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 879c18263d50..179500d6956a 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1344,6 +1344,10 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n)
             else {
                 read_size = _Unpickler_SetStringInput(self, data);
                 Py_DECREF(data);
+                if (read_size < 0) {
+                    return -1;
+                }
+
                 self->prefetched_idx = 0;
                 if (n <= read_size)
                     return n;