Fix Coverity null pointer dereference warning

nyalldawson · nyalldawson · commit 45d30a6b6188 · 2018-04-06T14:19:09.000+10:00
(cherry-picked from b22b62f)
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -109,7 +109,7 @@ void QgsAttributeTableView::setAttributeTableConfig( const QgsAttributeTableConf
 void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel )
 {
   mFilterModel = filterModel;
-  QTableView::setModel( filterModel );
+  QTableView::setModel( mFilterModel );
 
   if ( mFilterModel )
   {
@@ -120,7 +120,7 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel
   delete mFeatureSelectionModel;
   mFeatureSelectionModel = nullptr;
 
-  if ( filterModel )
+  if ( mFilterModel )
   {
     if ( !mFeatureSelectionManager )
     {
@@ -134,11 +134,11 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel
              this, static_cast<void ( QgsAttributeTableView::* )( const QModelIndexList &indexes )>( &QgsAttributeTableView::repaintRequested ) );
     connect( mFeatureSelectionModel, static_cast<void ( QgsFeatureSelectionModel::* )()>( &QgsFeatureSelectionModel::requestRepaint ),
              this, static_cast<void ( QgsAttributeTableView::* )()>( &QgsAttributeTableView::repaintRequested ) );
-  }
 
-  connect( mFilterModel->layer(), &QgsVectorLayer::editingStarted, this, &QgsAttributeTableView::recreateActionWidgets );
-  connect( mFilterModel->layer(), &QgsVectorLayer::editingStopped, this, &QgsAttributeTableView::recreateActionWidgets );
-  connect( mFilterModel->layer(), &QgsVectorLayer::readOnlyChanged, this, &QgsAttributeTableView::recreateActionWidgets );
+    connect( mFilterModel->layer(), &QgsVectorLayer::editingStarted, this, &QgsAttributeTableView::recreateActionWidgets );
+    connect( mFilterModel->layer(), &QgsVectorLayer::editingStopped, this, &QgsAttributeTableView::recreateActionWidgets );
+    connect( mFilterModel->layer(), &QgsVectorLayer::readOnlyChanged, this, &QgsAttributeTableView::recreateActionWidgets );
+  }
 }
 
 void QgsAttributeTableView::setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager )

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void QgsAttributeTableView::setAttributeTableConfig( const QgsAttributeTableConf`
`109`	`109`	`void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel )`
`110`	`110`	`{`
`111`	`111`	`mFilterModel = filterModel;`
`112`		`- QTableView::setModel( filterModel );`
	`112`	`+ QTableView::setModel( mFilterModel );`
`113`	`113`
`114`	`114`	`if ( mFilterModel )`
`115`	`115`	`{`
`@@ -120,7 +120,7 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel`
`120`	`120`	`delete mFeatureSelectionModel;`
`121`	`121`	`mFeatureSelectionModel = nullptr;`
`122`	`122`
`123`		`- if ( filterModel )`
	`123`	`+ if ( mFilterModel )`
`124`	`124`	`{`
`125`	`125`	`if ( !mFeatureSelectionManager )`
`126`	`126`	`{`
`@@ -134,11 +134,11 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel *filterModel`
`134`	`134`	`this, static_cast<void ( QgsAttributeTableView::* )( const QModelIndexList &indexes )>( &QgsAttributeTableView::repaintRequested ) );`
`135`	`135`	`connect( mFeatureSelectionModel, static_cast<void ( QgsFeatureSelectionModel::* )()>( &QgsFeatureSelectionModel::requestRepaint ),`
`136`	`136`	`this, static_cast<void ( QgsAttributeTableView::* )()>( &QgsAttributeTableView::repaintRequested ) );`
`137`		`- }`
`138`	`137`
`139`		`- connect( mFilterModel->layer(), &QgsVectorLayer::editingStarted, this, &QgsAttributeTableView::recreateActionWidgets );`
`140`		`- connect( mFilterModel->layer(), &QgsVectorLayer::editingStopped, this, &QgsAttributeTableView::recreateActionWidgets );`
`141`		`- connect( mFilterModel->layer(), &QgsVectorLayer::readOnlyChanged, this, &QgsAttributeTableView::recreateActionWidgets );`
	`138`	`+ connect( mFilterModel->layer(), &QgsVectorLayer::editingStarted, this, &QgsAttributeTableView::recreateActionWidgets );`
	`139`	`+ connect( mFilterModel->layer(), &QgsVectorLayer::editingStopped, this, &QgsAttributeTableView::recreateActionWidgets );`
	`140`	`+ connect( mFilterModel->layer(), &QgsVectorLayer::readOnlyChanged, this, &QgsAttributeTableView::recreateActionWidgets );`
	`141`	`+ }`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`void QgsAttributeTableView::setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager )`