gh-105375: Harden error handling in _testcapi/heaptype.c (#105608)

erlend-aasland · web-flow · commit d636d7dfe714 · 2023-06-09T21:53:33.000Z
Bail on first error in heapctypesubclasswithfinalizer_finalize()
diff --git 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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -661,8 +661,11 @@ heapctypesubclasswithfinalizer_finalize(PyObject *self)`
`661`	`661`	`goto cleanup_finalize;`
`662`	`662`	`}`
`663`	`663`	`oldtype = PyObject_GetAttrString(m, "HeapCTypeSubclassWithFinalizer");`
	`664`	`+ if (oldtype == NULL) {`
	`665`	`+ goto cleanup_finalize;`
	`666`	`+ }`
`664`	`667`	`newtype = PyObject_GetAttrString(m, "HeapCTypeSubclass");`
`665`		`- if (oldtype == NULL \|\| newtype == NULL) {`
	`668`	`+ if (newtype == NULL) {`
`666`	`669`	`goto cleanup_finalize;`
`667`	`670`	`}`
`668`	`671`