Fix leaks in Python-ast.c (#16127)

7 years ago · 0247e80f3c
2 changed files with 10 additions and 2 deletions
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@ -638,9 +638,13 @@ static void
 ast_dealloc(AST_object *self)
 {
    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyTypeObject *tp = Py_TYPE(self);
    PyObject_GC_UnTrack(self);
    Py_CLEAR(self->dict);
-    Py_TYPE(self)->tp_free(self);
+    freefunc free_func = PyType_GetSlot(tp, Py_tp_free);
+    assert(free_func != NULL);
+    free_func(self);
+    Py_DECREF(tp);
 }

 static int
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@ -1130,9 +1130,13 @@ static void
 ast_dealloc(AST_object *self)
 {
    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyTypeObject *tp = Py_TYPE(self);
    PyObject_GC_UnTrack(self);
    Py_CLEAR(self->dict);
-    Py_TYPE(self)->tp_free(self);
+    freefunc free_func = PyType_GetSlot(tp, Py_tp_free);
+    assert(free_func != NULL);
+    free_func(self);
+    Py_DECREF(tp);
 }

 static int