From d636d7dfe714e7168b342c7ea5f9f9d3b3569ed0 Mon Sep 17 00:00:00 2001
From: "Erlend E. Aasland" <erlend.aasland@protonmail.com>
Date: Fri, 9 Jun 2023 23:53:33 +0200
Subject: [PATCH] gh-105375: Harden error handling in `_testcapi/heaptype.c`
 (#105608)

Bail on first error in heapctypesubclasswithfinalizer_finalize()
---
 Modules/_testcapi/heaptype.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Modules/_testcapi/heaptype.c b/Modules/_testcapi/heaptype.c
index 3488e35922c5ac..565ab570a42bde 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;
     }