From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 9 Jun 2023 23:21:42 +0000 (-0700)
Subject: [3.12] gh-105375: Harden error handling in `_testcapi/heaptype.c` (GH-105608) (#105615)
X-Git-Tag: v3.12.0b3~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fbbf699c0d72f6db62484c88a05c826c3703eb5;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-105375: Harden error handling in `_testcapi/heaptype.c` (GH-105608) (#105615)

Bail on first error in heapctypesubclasswithfinalizer_finalize()
(cherry picked from commit d636d7dfe714e7168b342c7ea5f9f9d3b3569ed0)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
---

diff --git a/Modules/_testcapi/heaptype.c b/Modules/_testcapi/heaptype.c
index 3488e35922c5..565ab570a42b 100644
--- a/Modules/_testcapi/heaptype.c
+++ b/Modules/_testcapi/heaptype.c
@@ -661,8 +661,11 @@ heapctypesubclasswithfinalizer_finalize(PyObject *self)
         goto cleanup_finalize;
     }
     oldtype = PyObject_GetAttrString(m, "HeapCTypeSubclassWithFinalizer");
+    if (oldtype == NULL) {
+        goto cleanup_finalize;
+    }
     newtype = PyObject_GetAttrString(m, "HeapCTypeSubclass");
-    if (oldtype == NULL || newtype == NULL) {
+    if (newtype == NULL) {
         goto cleanup_finalize;
     }