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

miss-islington · ByteFlowing1337 · StanFromIreland · web-flow · commit abf5016b4dd4 · 2026-06-23T15:12:29.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
@@ -2079,6 +2079,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
@@ -4581,6 +4581,7 @@ _PyType_FromMetaclass_impl(
     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);
@@ -4862,7 +4863,7 @@ _PyType_FromMetaclass_impl(
 
     assert(_PyType_CheckConsistency(type));
 
- finally:
+finally:
     if (PyErr_Occurred()) {
         Py_CLEAR(res);
     }

Original file line number	Diff line number	Diff line change
`@@ -4581,6 +4581,7 @@ _PyType_FromMetaclass_impl(`
`4581`	`4581`	`Py_ssize_t name_buf_len = strlen(spec->name) + 1;`
`4582`	`4582`	`_ht_tpname = PyMem_Malloc(name_buf_len);`
`4583`	`4583`	`if (_ht_tpname == NULL) {`
	`4584`	`+ PyErr_NoMemory();`
`4584`	`4585`	`goto finally;`
`4585`	`4586`	`}`
`4586`	`4587`	`memcpy(_ht_tpname, spec->name, name_buf_len);`
`@@ -4862,7 +4863,7 @@ _PyType_FromMetaclass_impl(`
`4862`	`4863`
`4863`	`4864`	`assert(_PyType_CheckConsistency(type));`
`4864`	`4865`
`4865`		`- finally:`
	`4866`	`+finally:`
`4866`	`4867`	`if (PyErr_Occurred()) {`
`4867`	`4868`	`Py_CLEAR(res);`
`4868`	`4869`	`}`