[Python-checkins] bpo-38150 Fix refleak in the finalizer of a _testcapimodule type (GH-16115)

Fri Sep 13 12:48:07 EDT 2019

https://github.com/python/cpython/commit/a67ac2f2d9550e5a36d28f9b6eeacf6575dda2d5
commit: a67ac2f2d9550e5a36d28f9b6eeacf6575dda2d5
branch: master
author: Eddie Elizondo <eelizondo at fb.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019年09月13日T09:48:03-07:00
summary:
bpo-38150 Fix refleak in the finalizer of a _testcapimodule type (GH-16115)
The PyLong created in the finalizer was not being cleaned up
https://bugs.python.org/issue38150
Automerge-Triggered-By: @matrixise
files:
M Modules/_testcapimodule.c

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index dee06de107a1..4cca784d0148 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6304,7 +6304,7 @@ static void
 heapctypesubclasswithfinalizer_finalize(PyObject *self)
 {
 PyObject *error_type, *error_value, *error_traceback, *m;
- PyObject *oldtype = NULL, *newtype = NULL;
+ PyObject *oldtype = NULL, *newtype = NULL, *refcnt = NULL;
 
 /* Save the current exception, if any. */
 PyErr_Fetch(&error_type, &error_value, &error_traceback);
@@ -6322,18 +6322,26 @@ heapctypesubclasswithfinalizer_finalize(PyObject *self)
 if (PyObject_SetAttrString(self, "__class__", newtype) < 0) {
 goto cleanup_finalize;
 }
- if (PyObject_SetAttrString(
- oldtype, "refcnt_in_del", PyLong_FromSsize_t(Py_REFCNT(oldtype))) < 0) {
+ refcnt = PyLong_FromSsize_t(Py_REFCNT(oldtype));
+ if (refcnt == NULL) {
 goto cleanup_finalize;
 }
- if (PyObject_SetAttrString(
- newtype, "refcnt_in_del", PyLong_FromSsize_t(Py_REFCNT(newtype))) < 0) {
+ if (PyObject_SetAttrString(oldtype, "refcnt_in_del", refcnt) < 0) {
+ goto cleanup_finalize;
+ }
+ Py_DECREF(refcnt);
+ refcnt = PyLong_FromSsize_t(Py_REFCNT(newtype));
+ if (refcnt == NULL) {
+ goto cleanup_finalize;
+ }
+ if (PyObject_SetAttrString(newtype, "refcnt_in_del", refcnt) < 0) {
 goto cleanup_finalize;
 }
 
 cleanup_finalize:
 Py_XDECREF(oldtype);
 Py_XDECREF(newtype);
+ Py_XDECREF(refcnt);
 
 /* Restore the saved exception. */
 PyErr_Restore(error_type, error_value, error_traceback);
