[memory provider] Don't crash on updateExtent and feature without geometry

m-kuhn · m-kuhn · commit b53e80b84a80 · 2013-06-23T15:16:11.000+02:00
diff --git a/src/providers/memory/qgsmemoryprovider.cpp b/src/providers/memory/qgsmemoryprovider.cpp
@@ -422,9 +422,11 @@ void QgsMemoryProvider::updateExtent()
   }
   else
   {
-    mExtent = mFeatures.begin().value().geometry()->boundingBox();
-    for ( QgsFeatureMap::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it )
-      mExtent.unionRect( it.value().geometry()->boundingBox() );
+    Q_FOREACH( const QgsFeature& feat, mFeatures )
+    {
+      if ( feat.geometry() )
+        mExtent.unionRect( feat.geometry()->boundingBox() );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -422,9 +422,11 @@ void QgsMemoryProvider::updateExtent()`
`422`	`422`	`}`
`423`	`423`	`else`
`424`	`424`	`{`
`425`		`- mExtent = mFeatures.begin().value().geometry()->boundingBox();`
`426`		`- for ( QgsFeatureMap::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it )`
`427`		`- mExtent.unionRect( it.value().geometry()->boundingBox() );`
	`425`	`+ Q_FOREACH( const QgsFeature& feat, mFeatures )`
	`426`	`+ {`
	`427`	`+ if ( feat.geometry() )`
	`428`	`+ mExtent.unionRect( feat.geometry()->boundingBox() );`
	`429`	`+ }`
`428`	`430`	`}`
`429`	`431`	`}`
`430`	`432`