[Python-checkins] Fixes reference leak (#3457)

Steve Dower webhook-mailer at python.org
Fri Sep 8 14:35:41 EDT 2017


https://github.com/python/cpython/commit/af8d6b90723daa943c5cd0a38ee7564790d8687a
commit: af8d6b90723daa943c5cd0a38ee7564790d8687a
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017-09-08T11:35:38-07:00
summary:

Fixes reference leak (#3457)

files:
M PC/_findvs.cpp

diff --git a/PC/_findvs.cpp b/PC/_findvs.cpp
index 6c660115963..dd7c1fcb723 100644
--- a/PC/_findvs.cpp
+++ b/PC/_findvs.cpp
@@ -161,18 +161,26 @@ static PyObject *find_all_instances()
         PyObject *version = nullptr;
         PyObject *path = nullptr;
         PyObject *packages = nullptr;
+        PyObject *tuple = nullptr;
 
         if (FAILED(hr = inst->QueryInterface(&inst2)) ||
             !(name = get_install_name(inst2)) ||
             !(version = get_install_version(inst)) ||
             !(path = get_install_path(inst)) ||
             !(packages = get_installed_packages(inst2)) ||
-            PyList_Append(res, PyTuple_Pack(4, name, version, path, packages)) < 0)
+            !(tuple = PyTuple_Pack(4, name, version, path, packages)) ||
+            PyList_Append(res, tuple) < 0)
             goto iter_error;
 
+        Py_DECREF(tuple);
+        Py_DECREF(packages);
+        Py_DECREF(path);
+        Py_DECREF(version);
+        Py_DECREF(name);
         continue;
     iter_error:
         if (inst2) inst2->Release();
+        Py_XDECREF(tuple);
         Py_XDECREF(packages);
         Py_XDECREF(path);
         Py_XDECREF(version);



More information about the Python-checkins mailing list