Fix coverity issues

qgis · Jan 22, 2016 · bfad753 · bfad753
1 parent e83a7c8
commit bfad753
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7480,7 +7480,9 @@ void QgisApp::layerSubsetString()
         QgsLayerTreeUtils::insertLayerBelow( QgsProject::instance()->layerTreeRoot(), vlayer, newLayer );
         mLayerTreeView->setCurrentLayer( newLayer );
         // hide the old layer
-        QgsProject::instance()->layerTreeRoot()->findLayer( vlayer->id() )->setVisible( Qt::Unchecked );
+        QgsLayerTreeLayer* vLayerTreeLayer = QgsProject::instance()->layerTreeRoot()->findLayer( vlayer->id() );
+        if ( vLayerTreeLayer )
+          vLayerTreeLayer->setVisible( Qt::Unchecked );
         vlayer = newLayer;
       }
       else

diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -1788,7 +1788,7 @@ void QgsProjectProperties::checkOWS( QgsLayerTreeGroup* treeGroup, QStringList&
         owsNames << shortName;
       if ( l->type() == QgsMapLayer::VectorLayer )
       {
-        QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer *>( l );
+        QgsVectorLayer* vl = static_cast<QgsVectorLayer *>( l );
         if ( vl->dataProvider()->encoding() == "System" )
           encodingMessages << tr( "Update layer \"%1\" encoding" ).arg( l->name() );
       }

diff --git a/src/core/layertree/qgslayertreeutils.cpp b/src/core/layertree/qgslayertreeutils.cpp
@@ -399,6 +399,9 @@ QgsLayerTreeLayer* QgsLayerTreeUtils::insertLayerBelow( QgsLayerTreeGroup* group
 {
   // get the index of the reflayer
   QgsLayerTreeLayer* inTree = group->findLayer( refLayer->id() );
+  if ( !inTree )
+    return nullptr;
+
   int idx = 0;
   foreach ( QgsLayerTreeNode* vl, inTree->parent()->children() )
   {

diff --git a/src/gui/qgsfilewidget.cpp b/src/gui/qgsfilewidget.cpp
@@ -38,6 +38,7 @@ QgsFileWidget::QgsFileWidget( QWidget *parent )
     , mFilter( QString() )
     , mDefaultRoot( QString() )
     , mStorageMode( GetFile )
+    , mRelativeStorage( Absolute )
 {
   setBackgroundRole( QPalette::Window );
   setAutoFillBackground( true );

diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4056,7 +4056,7 @@ bool QgsSpatiaLiteProvider::changeGeometryValues( const QgsGeometryMap &geometry
   if ( toCommit )
   {
     // ROLLBACK after some previous error
-    sqlite3_exec( sqliteHandle, "ROLLBACK", nullptr, nullptr, nullptr );
+    ( void )sqlite3_exec( sqliteHandle, "ROLLBACK", nullptr, nullptr, nullptr );
   }
 
   return false;