Fix some Coverity null pointer dereference warnings

qgis · Apr 17, 2017 · 952bc02 · 952bc02
1 parent 6a72c94
commit 952bc02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -218,7 +218,7 @@ bool QgsComposerLegend::resizeToContents() const
 
 void QgsComposerLegend::setCustomLayerTree( QgsLayerTree *rootGroup )
 {
-  mLegendModel->setRootGroup( rootGroup ? rootGroup : mComposition->project()->layerTreeRoot() );
+  mLegendModel->setRootGroup( rootGroup ? rootGroup : ( mComposition ? mComposition->project()->layerTreeRoot() : nullptr ) );
 
   mCustomLayerTree.reset( rootGroup );
 }

diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp
@@ -439,7 +439,7 @@ void QgsPalettedRendererWidget::loadFromLayer()
 
 void QgsPalettedRendererWidget::gatheredClasses()
 {
-  if ( mGatherer && mGatherer->wasCanceled() )
+  if ( !mGatherer || mGatherer->wasCanceled() )
     return;
 
   mModel->setClassData( mGatherer->classes() );