[3.14] gh-151126: Add missing PyErr_NoMemory() in type_from_slots_or_spec (GH-151582)

miss-islington · ByteFlowing1337 · StanFromIreland · web-flow · commit 72153b504a71 · 2026-06-23T15:14:39.000Z
(cherry picked from commit 7928a8b) Co-authored-by: Ivy Xu <fakeshadow1337@gmail.com> Co-authored-by: Stan Ulbrych <stan@python.org>
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -2108,6 +2108,7 @@ Xiang Zhang
 Robert Xiao
 Florent Xicluna
 Yanbo, Xie
+Ivy Xu
 Kaisheng Xu
 Xinhang Xu
 Arnon Yaari
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -5114,6 +5114,7 @@ PyType_FromMetaclass(
     Py_ssize_t name_buf_len = strlen(spec->name) + 1;
     _ht_tpname = PyMem_Malloc(name_buf_len);
     if (_ht_tpname == NULL) {
+        PyErr_NoMemory();
         goto finally;
     }
     memcpy(_ht_tpname, spec->name, name_buf_len);
@@ -5397,7 +5398,7 @@ PyType_FromMetaclass(
 
     assert(_PyType_CheckConsistency(type));
 
- finally:
+finally:
     if (PyErr_Occurred()) {
         Py_CLEAR(res);
     }

Original file line number	Diff line number	Diff line change
`@@ -5114,6 +5114,7 @@ PyType_FromMetaclass(`
`5114`	`5114`	`Py_ssize_t name_buf_len = strlen(spec->name) + 1;`
`5115`	`5115`	`_ht_tpname = PyMem_Malloc(name_buf_len);`
`5116`	`5116`	`if (_ht_tpname == NULL) {`
	`5117`	`+ PyErr_NoMemory();`
`5117`	`5118`	`goto finally;`
`5118`	`5119`	`}`
`5119`	`5120`	`memcpy(_ht_tpname, spec->name, name_buf_len);`
`@@ -5397,7 +5398,7 @@ PyType_FromMetaclass(`
`5397`	`5398`
`5398`	`5399`	`assert(_PyType_CheckConsistency(type));`
`5399`	`5400`
`5400`		`- finally:`
	`5401`	`+finally:`
`5401`	`5402`	`if (PyErr_Occurred()) {`
`5402`	`5403`	`Py_CLEAR(res);`
`5403`	`5404`	`}`