[GRASS] coverity fixes

qgis · Oct 30, 2015 · 16e902b3c195bd3145fb3daff24aa5f514fba77b · 16e902b
1 parent ad3efc0
commit 16e902b3c195bd3145fb3daff24aa5f514fba77b
Unified Split

Showing with 12 additions and 1 deletion.

+5 −1 src/providers/grass/qgsgrass.cpp

+7 −0 tests/src/providers/grass/testqgsgrassprovider.cpp
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -593,7 +593,11 @@ void QgsGrass::setLocation( QString gisdbase, QString location )
 void QgsGrass::setMapset( QString gisdbase, QString location, QString mapset )
 {
   QgsDebugMsg( QString( "gisdbase = %1 location = %2 mapset = %3" ).arg( gisdbase, location, mapset ) );
-  init();
+  if ( !init() )
+  {
+    QgsDebugMsg( QgsGrass::initError() );
+    return;
+  }
 
   // Set principal GRASS variables (in memory)
 #ifdef Q_OS_WIN

diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -1061,6 +1061,13 @@ void TestQgsGrassProvider::edit()
 
         expectedLayer->startEditing();
       }
+
+      if ( !grassLayer || !grassProvider || !expectedLayer )
+      {
+        reportRow( "grassLayer, grassProvider or expectedLayer is null" );
+        commandOk = false;
+        break;
+      }
       else if ( command.command == TestQgsGrassCommand::CommitChanges )
       {
         grassLayer->commitChanges();