Merge pull request #6221 from nyalldawson/var_leak

Fix massive memory leak in PyQGIS, pt 1
This commit is contained in:
Nyall Dawson 2018-02-13 13:18:42 +11:00 committed by GitHub
commit a1a45536a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1709,7 +1709,11 @@ bool null_from_qvariant_converter( const QVariant *varp, PyObject **objp )
{
sWatchDog = true;
PyObject *vartype = sipConvertFromEnum( varp->type(), sipType_QVariant_Type );
*objp = PyObject_Call(( PyObject * )sipTypeAsPyTypeObject( sipType_QVariant ), PyTuple_Pack( 1, vartype ), nullptr );
PyObject *args = PyTuple_Pack( 1, vartype );
PyTypeObject *typeObj = sipTypeAsPyTypeObject( sipType_QVariant );
*objp = PyObject_Call(( PyObject * )typeObj, args, nullptr );
Py_DECREF(args);
Py_DECREF(vartype);
sWatchDog = false;
return true;
}