Fix crash in relation reference widget (fix #14732)

nyalldawson · nyalldawson · commit c7998127abb8 · 2016-04-26T20:07:53.000+10:00
(cherry-picked from eed4ee)
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -351,7 +351,11 @@ QVariant QgsRelationReferenceWidget::foreignKey()
   }
   else
   {
-    if ( !mFeature.isValid() )
+    if ( mReferencingFieldIdx < 0 || mReferencingFieldIdx >= mReferencingLayer->fields().count() )
+    {
+      return QVariant();
+    }
+    else if ( !mFeature.isValid() )
     {
       return QVariant( mReferencingLayer->fields().at( mReferencingFieldIdx ).type() );
     }

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,11 @@ QVariant QgsRelationReferenceWidget::foreignKey()`
`351`	`351`	`}`
`352`	`352`	`else`
`353`	`353`	`{`
`354`		`- if ( !mFeature.isValid() )`
	`354`	`+ if ( mReferencingFieldIdx < 0 \|\| mReferencingFieldIdx >= mReferencingLayer->fields().count() )`
	`355`	`+ {`
	`356`	`+ return QVariant();`
	`357`	`+ }`
	`358`	`+ else if ( !mFeature.isValid() )`
`355`	`359`	`{`
`356`	`360`	`return QVariant( mReferencingLayer->fields().at( mReferencingFieldIdx ).type() );`
`357`	`361`	`}`