Fixes crash in QgsRelationReferenceWidget

pblottiere · pblottiere · commit 7c2732d1ad71 · 2017-12-05T14:59:14.000Z
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -267,7 +267,8 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant &value )
 
       mReferencedLayer->getFeatures( request ).nextFeature( mFeature );
 
-      for ( int i = 0; i < mFilterFields.size(); i++ )
+      const int count = std::min( mFilterComboBoxes.size(), mFilterFields.size() );
+      for ( int i = 0; i < count; i++ )
       {
         QVariant v = mFeature.attribute( mFilterFields[i] );
         QString f = v.isNull() ? nullValue.toString() : v.toString();

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,8 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant &value )`
`267`	`267`
`268`	`268`	`mReferencedLayer->getFeatures( request ).nextFeature( mFeature );`
`269`	`269`
`270`		`- for ( int i = 0; i < mFilterFields.size(); i++ )`
	`270`	`+ const int count = std::min( mFilterComboBoxes.size(), mFilterFields.size() );`
	`271`	`+ for ( int i = 0; i < count; i++ )`
`271`	`272`	`{`
`272`	`273`	`QVariant v = mFeature.attribute( mFilterFields[i] );`
`273`	`274`	`QString f = v.isNull() ? nullValue.toString() : v.toString();`