Other check for null pointer before calling decref

qgis · May 23, 2016 · 9b2be7a2e16757620c08e93bc2ac2ccc54289de0 · 9b2be7a
1 parent a1e826e
commit 9b2be7a2e16757620c08e93bc2ac2ccc54289de0
Unified Split

Showing with 6 additions and 4 deletions.

+6 −4 src/python/qgspythonutilsimpl.cpp
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -580,11 +580,13 @@ bool QgsPythonUtilsImpl::evalString( const QString& command, QString& result )
   bool success = nullptr != res;
 
   // TODO: error handling
+  if ( res )
+  {
+    if ( success )
+      result = PyObjectToQString( res );
 
-  if ( success )
-    result = PyObjectToQString( res );
-
-  Py_XDECREF( res );
+    Py_XDECREF( res );
+  }
 
   // we are done calling python API, release global interpreter lock
   PyGILState_Release( gstate );