[spatialite] Fix crash with a subset of attributes request for joined…

… field
qgis · Oct 10, 2013 · e32930d · e32930d
1 parent 5e14fea
commit e32930d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -321,8 +321,19 @@ bool QgsSpatiaLiteFeatureIterator::getFeature( sqlite3_stmt *stmt, QgsFeature &f
     }
     else
     {
-      int attrIndex = subsetAttributes ? mRequest.subsetOfAttributes()[ic-1] : ic - 1;
-      feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic, P->attributeFields[attrIndex].type() ) );
+      if ( subsetAttributes )
+      {
+        if ( mRequest.subsetOfAttributes().contains( ic - 1 ) )
+        {
+          int attrIndex = mRequest.subsetOfAttributes()[ic-1];
+          feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic, P->attributeFields[attrIndex].type() ) );
+        }
+      }
+      else
+      {
+        int attrIndex = subsetAttributes ? mRequest.subsetOfAttributes()[ic-1] : ic - 1;
+        feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic, P->attributeFields[attrIndex].type() ) );
+      }
     }
   }