More Coverity fixes

qgis · Feb 11, 2015 · 25652e4 · 25652e4
1 parent 5397d6b
commit 25652e4
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 19 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3007,7 +3007,10 @@ bool QgisApp::askUserForZipItemLayers( QString path )
     {
       QgsDataItem *item = zipItem->children()[i];
       QgsLayerItem *layerItem = dynamic_cast<QgsLayerItem *>( item );
-      QgsDebugMsgLevel( QString( "item path=%1 provider=%2" ).arg( item->path() ).arg( layerItem->providerKey() ), 2 );
+      if ( layerItem )
+      {
+        QgsDebugMsgLevel( QString( "item path=%1 provider=%2" ).arg( item->path() ).arg( layerItem->providerKey() ), 2 );
+      }
       if ( layerItem && layerItem->providerKey() == "gdal" )
       {
         layers << QString( "%1|%2|%3" ).arg( i ).arg( item->name() ).arg( "Raster" );

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -777,7 +777,7 @@ static QVariant fcnRegexpSubstr( const QVariantList& values, const QgsFeature*,
   }
 
   // extract substring
-  re.indexIn( str );
+  ( void )re.indexIn( str );
   if ( re.captureCount() > 0 )
   {
     // return first capture

diff --git a/src/core/qgslogger.cpp b/src/core/qgslogger.cpp
@@ -146,7 +146,8 @@ void QgsLogger::logMessageToFile( QString theMessage )
 
   //Maybe more efficient to keep the file open for the life of qgis...
   QFile file( sLogFile );
-  file.open( QIODevice::Append );
+  if ( !file.open( QIODevice::Append ) )
+    return;
   file.write( theMessage.toLocal8Bit().constData() );
   file.write( "\n" );
   file.close();

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3702,7 +3702,8 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs
     if ( elem->type() == AeTypeContainer )
     {
       QgsAttributeEditorContainer* cont = dynamic_cast<QgsAttributeEditorContainer*>( elem );
-      results += cont->findElements( type );
+      if ( cont )
+        results += cont->findElements( type );
     }
   }
 

diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -56,7 +56,7 @@ QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int th
     , mNoDataBitmapWidth( 0 )
     , mNoDataBitmapSize( 0 )
 {
-  reset( mDataType, mWidth, mHeight );
+  ( void )reset( mDataType, mWidth, mHeight );
 }
 
 QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
@@ -73,7 +73,7 @@ QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int th
     , mNoDataBitmapWidth( 0 )
     , mNoDataBitmapSize( 0 )
 {
-  reset( mDataType, mWidth, mHeight, mNoDataValue );
+  ( void )reset( mDataType, mWidth, mHeight, mNoDataValue );
 }
 
 QgsRasterBlock::~QgsRasterBlock()

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -1092,6 +1092,9 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
   if ( renderer->type() == "categorizedSymbol" )
   {
     const QgsCategorizedSymbolRendererV2* categorizedRenderer = dynamic_cast<const QgsCategorizedSymbolRendererV2*>( renderer );
+    if ( !categorizedRenderer )
+      return 0;
+
     QgsRuleBasedRendererV2::Rule* rootrule = new QgsRuleBasedRendererV2::Rule( NULL );
 
     QString expression;

diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp b/src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp
@@ -169,8 +169,8 @@ QSqlQuery* eVisDatabaseConnection::query( QString sqlStatement )
     //set forward only is required for OBDC on linux
     mQuery = QSqlQuery( mDatabase );
     mQuery.setForwardOnly( true );
-    mQuery.exec( sqlStatement );
-    if ( mQuery.isActive() )
+    bool execOk = mQuery.exec( sqlStatement );
+    if ( execOk && mQuery.isActive() )
     {
       return &mQuery;
     }

diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -294,7 +294,8 @@ bool QgsGeorefTransform::getLinearOriginScale( QgsPoint &origin, double &scaleX,
   {
     return false;
   }
-  return dynamic_cast<QgsLinearGeorefTransform *>( mGeorefTransformImplementation )->getOriginScale( origin, scaleX, scaleY );
+  QgsLinearGeorefTransform* transform = dynamic_cast<QgsLinearGeorefTransform *>( mGeorefTransformImplementation );
+  return transform && transform->getOriginScale( origin, scaleX, scaleY );
 }
 
 bool QgsGeorefTransform::getOriginScaleRotation( QgsPoint &origin, double &scaleX, double &scaleY, double& rotation ) const

diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -136,7 +136,7 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
   // issue the sql query
   QSqlQuery q = QSqlQuery( db );
   q.setForwardOnly( true );
-  q.exec( query );
+  ( void )q.exec( query );
 
   if ( q.isActive() )
   {

diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -920,7 +920,16 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList & flist )
       }
     }
 
-    query.next();
+    if ( !query.next() )
+    {
+      QString msg = query.lastError().text();
+      QgsDebugMsg( msg );
+      if ( !mSkipFailures )
+      {
+        pushError( msg );
+        return false;
+      }
+    }
     it->setFeatureId( query.value( 0 ).toLongLong() );
   }
 
@@ -1315,17 +1324,17 @@ QgsCoordinateReferenceSystem QgsMssqlProvider::crs()
     // try to load crs
     QSqlQuery query = QSqlQuery( mDatabase );
     query.setForwardOnly( true );
-    query.exec( QString( "select srtext from spatial_ref_sys where srid = %1" ).arg( QString::number( mSRId ) ) );
-    if ( query.isActive() )
+    bool execOk = query.exec( QString( "select srtext from spatial_ref_sys where srid = %1" ).arg( QString::number( mSRId ) ) );
+    if ( execOk && query.isActive() )
     {
       if ( query.next() && mCrs.createFromWkt( query.value( 0 ).toString() ) )
         return mCrs;
 
       query.finish();
     }
     query.clear();
-    query.exec( QString( "select well_known_text from sys.spatial_reference_systems where spatial_reference_id = %1" ).arg( QString::number( mSRId ) ) );
-    if ( query.isActive() && query.next() && mCrs.createFromWkt( query.value( 0 ).toString() ) )
+    execOk = query.exec( QString( "select well_known_text from sys.spatial_reference_systems where spatial_reference_id = %1" ).arg( QString::number( mSRId ) ) );
+    if ( execOk && query.isActive() && query.next() && mCrs.createFromWkt( query.value( 0 ).toString() ) )
       return mCrs;
   }
   return mCrs;

diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -541,7 +541,7 @@ void QgsMssqlSourceSelect::on_btnConnect_clicked()
   // issue the sql query
   QSqlQuery q = QSqlQuery( db );
   q.setForwardOnly( true );
-  q.exec( query );
+  ( void )q.exec( query );
 
   if ( q.isActive() )
   {

diff --git a/tests/bench/qgsbench.cpp b/tests/bench/qgsbench.cpp
@@ -339,7 +339,9 @@ QString QgsBench::serialize( QMap<QString, QVariant> theMap, int level )
 void QgsBench::saveLog( const QString & fileName )
 {
   QFile file( fileName );
-  file.open( QIODevice::WriteOnly | QIODevice::Text );
+  if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) )
+    return;
+
   QTextStream out( &file );
   out << serialize( mLogMap ).toAscii().constData() << "\n";
   file.close();

diff --git a/tests/qt_modeltest/modeltest.cpp b/tests/qt_modeltest/modeltest.cpp
@@ -132,7 +132,7 @@ void ModelTest::nonDestructiveBasicTest()
   fetchingMore = false;
   Qt::ItemFlags flags = model->flags( QModelIndex() );
   Q_ASSERT( flags == Qt::ItemIsDropEnabled || flags == 0 );
-  model->hasChildren( QModelIndex() );
+  ( void )model->hasChildren( QModelIndex() );
   model->hasIndex( 0, 0 );
   model->headerData( 0, Qt::Horizontal );
   model->index( 0, 0 );

diff --git a/tests/src/core/testqgsmaplayerstylemanager.cpp b/tests/src/core/testqgsmaplayerstylemanager.cpp
@@ -114,6 +114,7 @@ void TestQgsMapLayerStyleManager::testReadWrite()
   sm0.addStyleFromLayer( "blue" );
   sm0.setCurrentStyle( "blue" );
   QgsSingleSymbolRendererV2* r1 = dynamic_cast<QgsSingleSymbolRendererV2*>( mVL->rendererV2() );
+  QVERIFY( r1 );
   r1->symbol()->setColor( Qt::blue );
 
   // read and write

diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp
@@ -546,7 +546,7 @@ void TestQgsWcsPublicServers::test()
       myVersionLogFile.close();
     }
     QFile myServerLogFile( myServerLogPath );
-    myServerLogFile.open( QIODevice::WriteOnly | QIODevice::Text );
+    Q_ASSERT( myServerLogFile.open( QIODevice::WriteOnly | QIODevice::Text ) );
     QTextStream myServerStream( &myServerLogFile );
     myServerStream << myServerLog.join( "\n" );
     myServerLogFile.close();