Fix massive memory leak in PyQGIS, pt 1

nyalldawson · nyalldawson · commit bbf3ed9d4e43 · 2018-01-30T16:00:39.000+10:00
diff --git a/python/core/conversions.sip b/python/core/conversions.sip
@@ -2249,7 +2249,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;
   }

Original file line number	Diff line number	Diff line change
`@@ -2249,7 +2249,11 @@ bool null_from_qvariant_converter( const QVariant varp, PyObject *objp )`
`2249`	`2249`	`{`
`2250`	`2250`	`sWatchDog = true;`
`2251`	`2251`	`PyObject *vartype = sipConvertFromEnum( varp->type(), sipType_QVariant_Type );`
`2252`		`- objp = PyObject_Call(( PyObject )sipTypeAsPyTypeObject( sipType_QVariant ), PyTuple_Pack( 1, vartype ), nullptr );`
	`2252`	`+ PyObject *args = PyTuple_Pack( 1, vartype );`
	`2253`	`+ PyTypeObject *typeObj = sipTypeAsPyTypeObject( sipType_QVariant );`
	`2254`	`+ objp = PyObject_Call(( PyObject )typeObj, args, nullptr );`
	`2255`	`+ Py_DECREF(args);`
	`2256`	`+ Py_DECREF(vartype);`
`2253`	`2257`	`sWatchDog = false;`
`2254`	`2258`	`return true;`
`2255`	`2259`	`}`