From 2ff445be4ea6a74b105606118ed50ab4505ee6a1 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 23 Jun 2026 17:15:00 +0200 Subject: [PATCH] [3.15] gh-151126: Add missing `PyErr_NoMemory()` in `type_from_slots_or_spec` (GH-151582) (#152016) (cherry picked from commit 7928a8b730b0334c9f97c2144ab00fe0d88f1e97) Co-authored-by: Ivy Xu Co-authored-by: Stan Ulbrych --- Misc/ACKS | 1 + Objects/typeobject.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index 38817b1698c0..5b5df7ae11f2 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -2144,6 +2144,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 index 12821b134d97..969ae450013a 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5488,6 +5488,7 @@ type_from_slots_or_spec( Py_ssize_t name_buf_len = strlen(it.name) + 1; _ht_tpname = PyMem_Malloc(name_buf_len); if (_ht_tpname == NULL) { + PyErr_NoMemory(); goto finally; } memcpy(_ht_tpname, it.name, name_buf_len); @@ -5774,7 +5775,7 @@ type_from_slots_or_spec( ((PyObject*)type)->ob_flags |= _Py_TYPE_REVEALED_FLAG; #endif - finally: +finally: if (PyErr_Occurred()) { Py_CLEAR(res); } -- 2.47.3