[3.6] Fixes reference leak (GH-3457) (#3460)

(cherry picked from commit af8d6b9072)
This commit is contained in:
Miss Islington (bot) 2017-09-08 14:26:27 -07:00 committed by Steve Dower
parent ddb536ba7b
commit ef18b0dab9
1 changed files with 9 additions and 1 deletions

View File

@ -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);