Fixes bug #7688

ccrook · ccrook · commit 7603f3e17aa6 · 2013-04-26T10:26:47.000+12:00
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -38,9 +38,12 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
     // prepare list of attributes to match provider fields
     QgsAttributeList providerSubset;
     QgsAttributeList subset = mProviderRequest.subsetOfAttributes();
+    const QgsFields &pendingFields = L->pendingFields();
+    int nPendingFields = pendingFields.count();
     for ( int i = 0; i < subset.count(); ++i )
     {
       int attrIndex = subset[i];
+      if( attrIndex < 0 || attrIndex >= nPendingFields ) continue;
       if ( L->pendingFields().fieldOrigin( attrIndex ) == QgsFields::OriginProvider )
         providerSubset << L->pendingFields().fieldOriginIndex( attrIndex );
     }
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -53,9 +53,11 @@ bool QgsDelimitedTextFeatureIterator::nextFeature( QgsFeature& feature )
   while ( true )
   {
     QgsDelimitedTextFile::Status status = P->mFile->nextRecord( tokens );
-    int fid = P->mFile->recordLineNumber();
     if ( status == QgsDelimitedTextFile::RecordEOF ) break;
     if ( status != QgsDelimitedTextFile::RecordOk ) continue;
+
+    int fid = P->mFile->recordLineNumber();
+    if( mRequest.filterType() == QgsFeatureRequest::FilterFid && fid != mRequest.filterFid()) continue;
     if ( P->recordIsEmpty( tokens ) ) continue;
 
     while ( tokens.size() < P->mFieldCount )
@@ -98,8 +100,6 @@ bool QgsDelimitedTextFeatureIterator::nextFeature( QgsFeature& feature )
       for ( QgsAttributeList::const_iterator i = attrs.begin(); i != attrs.end(); ++i )
       {
         int fieldIdx = *i;
-        if ( fieldIdx < 0 || fieldIdx >= P->attributeColumns.count() )
-          continue; // ignore non-existant fields
         fetchAttribute( feature, fieldIdx, tokens );
       }
     }
@@ -209,7 +209,10 @@ bool QgsDelimitedTextFeatureIterator::boundsCheck( QgsGeometry *geom )
 
 void QgsDelimitedTextFeatureIterator::fetchAttribute( QgsFeature& feature, int fieldIdx, const QStringList& tokens )
 {
-  const QString &value = tokens[P->attributeColumns[fieldIdx]];
+  if( fieldIdx < 0 || fieldIdx >= P->attributeColumns.count()) return;
+  int column = P->attributeColumns[fieldIdx];
+  if( column < 0 || column >= tokens.count()) return;
+  const QString &value = tokens[column];
   QVariant val;
   switch ( P->attributeFields[fieldIdx].type() )
   {
diff --git a/tests/src/python/test_qgsdelimitedtextprovider.py b/tests/src/python/test_qgsdelimitedtextprovider.py

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,12 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la`
`38`	`38`	`// prepare list of attributes to match provider fields`
`39`	`39`	`QgsAttributeList providerSubset;`
`40`	`40`	`QgsAttributeList subset = mProviderRequest.subsetOfAttributes();`
	`41`	`+ const QgsFields &pendingFields = L->pendingFields();`
	`42`	`+ int nPendingFields = pendingFields.count();`
`41`	`43`	`for ( int i = 0; i < subset.count(); ++i )`
`42`	`44`	`{`
`43`	`45`	`int attrIndex = subset[i];`
	`46`	`+ if( attrIndex < 0 \|\| attrIndex >= nPendingFields ) continue;`
`44`	`47`	`if ( L->pendingFields().fieldOrigin( attrIndex ) == QgsFields::OriginProvider )`
`45`	`48`	`providerSubset << L->pendingFields().fieldOriginIndex( attrIndex );`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,11 @@ bool QgsDelimitedTextFeatureIterator::nextFeature( QgsFeature& feature )`
`53`	`53`	`while ( true )`
`54`	`54`	`{`
`55`	`55`	`QgsDelimitedTextFile::Status status = P->mFile->nextRecord( tokens );`
`56`		`- int fid = P->mFile->recordLineNumber();`
`57`	`56`	`if ( status == QgsDelimitedTextFile::RecordEOF ) break;`
`58`	`57`	`if ( status != QgsDelimitedTextFile::RecordOk ) continue;`
	`58`	`+`
	`59`	`+ int fid = P->mFile->recordLineNumber();`
	`60`	`+ if( mRequest.filterType() == QgsFeatureRequest::FilterFid && fid != mRequest.filterFid()) continue;`
`59`	`61`	`if ( P->recordIsEmpty( tokens ) ) continue;`
`60`	`62`
`61`	`63`	`while ( tokens.size() < P->mFieldCount )`
`@@ -98,8 +100,6 @@ bool QgsDelimitedTextFeatureIterator::nextFeature( QgsFeature& feature )`
`98`	`100`	`for ( QgsAttributeList::const_iterator i = attrs.begin(); i != attrs.end(); ++i )`
`99`	`101`	`{`
`100`	`102`	`int fieldIdx = *i;`
`101`		`- if ( fieldIdx < 0 \|\| fieldIdx >= P->attributeColumns.count() )`
`102`		`- continue; // ignore non-existant fields`
`103`	`103`	`fetchAttribute( feature, fieldIdx, tokens );`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -209,7 +209,10 @@ bool QgsDelimitedTextFeatureIterator::boundsCheck( QgsGeometry *geom )`
`209`	`209`
`210`	`210`	`void QgsDelimitedTextFeatureIterator::fetchAttribute( QgsFeature& feature, int fieldIdx, const QStringList& tokens )`
`211`	`211`	`{`
`212`		`- const QString &value = tokens[P->attributeColumns[fieldIdx]];`
	`212`	`+ if( fieldIdx < 0 \|\| fieldIdx >= P->attributeColumns.count()) return;`
	`213`	`+ int column = P->attributeColumns[fieldIdx];`
	`214`	`+ if( column < 0 \|\| column >= tokens.count()) return;`
	`215`	`+ const QString &value = tokens[column];`
`213`	`216`	`QVariant val;`
`214`	`217`	`switch ( P->attributeFields[fieldIdx].type() )`
`215`	`218`	`{`