diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-07-04 17:55:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-04 17:55:35 (GMT) |
commit | 68330b681a4b63cedad58fcfd1d9573209bad21d (patch) | |
tree | d507dc14072730d9ea3db8b07b0e21eb66871934 | |
parent | 9bf7c2d638a582af2444bc864feba13ab8957b68 (diff) | |
download | cpython-68330b681a4b63cedad58fcfd1d9573209bad21d.zip cpython-68330b681a4b63cedad58fcfd1d9573209bad21d.tar.gz cpython-68330b681a4b63cedad58fcfd1d9573209bad21d.tar.bz2 |
bpo-44562: Remove invalid PyObject_GC_Del from error path of types.GenericAlias … (GH-27016)
(cherry picked from commit d33943a6c368c2184e238019c63ac7a267da5594)
Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
-rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst | 2 | ||||
-rw-r--r-- | Objects/genericaliasobject.c | 6 |
2 files changed, 5 insertions, 3 deletions
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 0000000..2fc65bc --- /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 756a7ce..48a8be1 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; } |