sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some leaks and errors in sip conversions

Browse Source
This commit is contained in:
Nyall Dawson 2018-01-29 01:39:28 +10:00
parent ebb725ec04
commit f9a8161733
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/core/conversions.sip
View File

@ -1799,6 +1799,8 @@ template<int, TYPE2*>
return NULL;
}
Py_DECREF(valueobj);
Py_DECREF(keyobj);
}
return d;
@ -1997,9 +1999,7 @@ template <TYPE>
{
Py_DECREF(l);
if (tobj)
Py_DECREF(tobj);
else
if (!tobj)
delete t;
return NULL;
@ -2073,8 +2073,6 @@ template <TYPE>
PyObject *keyobj = PyLong_FromLong(it.key());
PyObject *pyOobj = sipConvertFromType(oobj, sipType_QgsFeature, sipTransferObj);
PyDict_SetItem(d, keyobj, pyOobj);
if(pyOobj == NULL || keyobj == NULL || PyDict_SetItem(d, keyobj, pyOobj) < 0)
{
Py_DECREF(d);
@ -2083,6 +2081,10 @@ template <TYPE>
{
Py_DECREF(pyOobj);
}
else
{
delete oobj;
}
if (keyobj)
{