Revert "bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAlias … (GH-27016) (GH-27018)" (GH-27022)
https://github.com/python/cpython/commit/fe847a62852c3baaec6c97a5e2e7b2e6673... commit: fe847a62852c3baaec6c97a5e2e7b2e66732bdb8 branch: 3.9 author: Pablo Galindo <Pablogsal@gmail.com> committer: pablogsal <Pablogsal@gmail.com> date: 2021-07-04T20:26:34+01:00 summary: Revert "bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAlias … (GH-27016) (GH-27018)" (GH-27022) This reverts commit 4684a34c8d2a2ffac7b779edb4ba57f043783478. files: D 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 deleted file mode 100644 index 2fc65bcfdeef4..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst +++ /dev/null @@ -1,2 +0,0 @@ -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 bb5fa095d3573..945d20593c7c9 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -602,7 +602,7 @@ ga_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; } if (!setup_ga(self, origin, arguments)) { - Py_DECREF(self); + type->tp_free((PyObject *)self); return NULL; } return (PyObject *)self; @@ -644,10 +644,10 @@ Py_GenericAlias(PyObject *origin, PyObject *args) if (alias == NULL) { return NULL; } - _PyObject_GC_TRACK(alias); if (!setup_ga(alias, origin, args)) { - Py_DECREF(alias); + PyObject_GC_Del((PyObject *)alias); return NULL; } + _PyObject_GC_TRACK(alias); return (PyObject *)alias; }
participants (1)
-
pablogsal