fix #1915

git-svn-id: http://svn.osgeo.org/qgis/trunk@11539 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 2, 2009 · 6bea923 · 6bea923
1 parent 1f05829
commit 6bea923
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -373,7 +373,7 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
   while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) != NULL )
   {
     // skip features without geometry
-    if ( OGR_F_GetGeometryRef( fet ) == NULL && !mFetchFeaturesWithoutGeom )
+    if ( !mFetchFeaturesWithoutGeom && OGR_F_GetGeometryRef( fet ) == NULL )
     {
       OGR_F_Destroy( fet );
       continue;
@@ -389,6 +389,12 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
     {
       OGRGeometryH geom = OGR_F_GetGeometryRef( fet );
 
+      if ( geom == 0 )
+      {
+        OGR_F_Destroy( fet );
+        continue;
+      }
+
       // get the wkb representation
       unsigned char *wkb = new unsigned char[OGR_G_WkbSize( geom )];
       OGR_G_ExportToWkb( geom, ( OGRwkbByteOrder ) QgsApplication::endian(), wkb );