From: Pablo Galindo <Pablogsal@gmail.com>
Date: Sun, 4 Jul 2021 19:26:34 +0000 (+0100)
Subject: Revert "bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAli... 
X-Git-Tag: v3.9.7~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe847a62852c3baaec6c97a5e2e7b2e66732bdb8;p=thirdparty%2FPython%2Fcpython.git

Revert "bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAlias … (GH-27016) (GH-27018)" (GH-27022)

This reverts commit 4684a34c8d2a2ffac7b779edb4ba57f043783478.
---

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 2fc65bcfdeef..000000000000
--- 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 bb5fa095d357..945d20593c7c 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;
 }