Fix memory leak in OGR provider when feature has no geometry

and FilterRect is used (cherry-picked from 6b80518)
qgis · May 16, 2016 · 7a4ef0d396d9d460b9189054eaddb428462cc5eb · 7a4ef0d
1 parent 8f0ee1f
commit 7a4ef0d396d9d460b9189054eaddb428462cc5eb
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 src/providers/ogr/qgsogrfeatureiterator.cpp
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -226,13 +226,14 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
   {
     if ( !readFeature( fet, feature ) )
       continue;
+    else
+      OGR_F_Destroy( fet );
 
     if ( !mRequest.filterRect().isNull() && !feature.constGeometry() )
       continue;
 
     // we have a feature, end this cycle
     feature.setValid( true );
-    OGR_F_Destroy( fet );
     return true;
 
   } // while