Fix crash in relation reference widget (fix #14732)

nyalldawson · nyalldawson · commit eed4ee6411ef · 2016-04-26T19:31:35.000+10:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -365,7 +365,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
`@@ -365,7 +365,11 @@ QVariant QgsRelationReferenceWidget::foreignKey()`
`365`	`365`	`}`
`366`	`366`	`else`
`367`	`367`	`{`
`368`		`- if ( !mFeature.isValid() )`
	`368`	`+ if ( mReferencingFieldIdx < 0 \|\| mReferencingFieldIdx >= mReferencingLayer->fields().count() )`
	`369`	`+ {`
	`370`	`+ return QVariant();`
	`371`	`+ }`
	`372`	`+ else if ( !mFeature.isValid() )`
`369`	`373`	`{`
`370`	`374`	`return QVariant( mReferencingLayer->fields().at( mReferencingFieldIdx ).type() );`
`371`	`375`	`}`