https://github.com/python/cpython/commit/d33943a6c368c2184e238019c63ac7a267d... commit: d33943a6c368c2184e238019c63ac7a267da5594 branch: main author: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> committer: pablogsal <Pablogsal@gmail.com> date: 2021-07-04T17:47:38+01:00 summary: bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAlias … (GH-27016) files: A Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst M Objects/genericaliasobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst new file mode 100644 index 0000000000000..2fc65bcfdeef4 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst @@ -0,0 +1,2 @@ +Remove uses of :c:func:`PyObject_GC_Del` in error path when initializing +:class:`types.GenericAlias`. diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c index 756a7ce474aee..48a8be1c45875 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -603,7 +603,7 @@ ga_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; } if (!setup_ga(self, origin, arguments)) { - type->tp_free((PyObject *)self); + Py_DECREF(self); return NULL; } return (PyObject *)self; @@ -650,10 +650,10 @@ Py_GenericAlias(PyObject *origin, PyObject *args) if (alias == NULL) { return NULL; } + _PyObject_GC_TRACK(alias); if (!setup_ga(alias, origin, args)) { - PyObject_GC_Del((PyObject *)alias); + Py_DECREF(alias); return NULL; } - _PyObject_GC_TRACK(alias); return (PyObject *)alias; }