Don't crash when iterating cached features

m-kuhn · m-kuhn · commit b756fe73c0ad · 2013-11-25T14:03:09.000+01:00
diff --git a/src/core/qgscachedfeatureiterator.cpp b/src/core/qgscachedfeatureiterator.cpp
@@ -57,9 +57,10 @@ bool QgsCachedFeatureIterator::fetchFeature( QgsFeature& f )
   if ( mClosed )
     return false;
 
-  while ( mFeatureIdIterator++ != mFeatureIds.constEnd() )
+  while ( mFeatureIdIterator != mFeatureIds.constEnd() )
   {
     f = QgsFeature( *mVectorLayerCache->mCache[*mFeatureIdIterator]->feature() );
+    ++mFeatureIdIterator;
     if ( mRequest.acceptFeature( f ) )
       return true;
   }

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,10 @@ bool QgsCachedFeatureIterator::fetchFeature( QgsFeature& f )`
`57`	`57`	`if ( mClosed )`
`58`	`58`	`return false;`
`59`	`59`
`60`		`- while ( mFeatureIdIterator++ != mFeatureIds.constEnd() )`
	`60`	`+ while ( mFeatureIdIterator != mFeatureIds.constEnd() )`
`61`	`61`	`{`
`62`	`62`	`f = QgsFeature( mVectorLayerCache->mCache[mFeatureIdIterator]->feature() );`
	`63`	`+ ++mFeatureIdIterator;`
`63`	`64`	`if ( mRequest.acceptFeature( f ) )`
`64`	`65`	`return true;`
`65`	`66`	`}`