Fix #9532 (node tool crash on a layer with a feature without geometry)

wonder-sk · wonder-sk · commit d7379ca1abc7 · 2014-04-15T20:16:35.000+02:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -291,6 +291,9 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
       QgsGeometry* geometry = feature.geometry();
       if ( !geometry ) feature.setGeometryAndOwnership( wkb, memorySize ); else geometry->fromWkb( wkb, memorySize );
     }
+    else
+      feature.setGeometry( 0 );
+
     if (( useIntersect && ( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
         || ( geometryTypeFilter && ( !feature.geometry() || QgsOgrProvider::ogrWkbSingleFlatten(( OGRwkbGeometryType )feature.geometry()->wkbType() ) != mSource->mOgrGeometryTypeFilter ) ) )
     {

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,9 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )`
`291`	`291`	`QgsGeometry* geometry = feature.geometry();`
`292`	`292`	`if ( !geometry ) feature.setGeometryAndOwnership( wkb, memorySize ); else geometry->fromWkb( wkb, memorySize );`
`293`	`293`	`}`
	`294`	`+ else`
	`295`	`+ feature.setGeometry( 0 );`
	`296`	`+`
`294`	`297`	`if (( useIntersect && ( !feature.geometry() \|\| !feature.geometry()->intersects( mRequest.filterRect() ) ) )`
`295`	`298`	`\|\| ( geometryTypeFilter && ( !feature.geometry() \|\| QgsOgrProvider::ogrWkbSingleFlatten(( OGRwkbGeometryType )feature.geometry()->wkbType() ) != mSource->mOgrGeometryTypeFilter ) ) )`
`296`	`299`	`{`