Fix index-out-of-bounds crash

qgis · Dec 20, 2016 · 35a2be6 · 35a2be6
1 parent 8b2ea98
commit 35a2be6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -89,11 +89,16 @@ QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry()
 
 QgsEditorWidgetSetup QgsEditorWidgetRegistry::findBest( const QgsVectorLayer* vl, const QString& fieldName ) const
 {
-  QgsEditorWidgetSetup setup = vl->fields().field( fieldName ).editorWidgetSetup();
-  if ( !setup.isNull() )
+  QgsFields fields = vl->fields();
+  int index = fields.indexOf( fieldName );
+
+  if ( index > -1 )
   {
-    return setup;
+    QgsEditorWidgetSetup setup = vl->fields().at( index ).editorWidgetSetup();
+    if ( !setup.isNull() )
+      return setup;
   }
+
   return mAutoConf.editorWidgetSetup( vl, fieldName );
 }