Fix some Coverity use-after-free warnings

(cherry-picked from eb39579)
qgis · Apr 6, 2018 · 3db0569 · 3db0569
1 parent 2900ae2
commit 3db0569
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7368,8 +7368,10 @@ QgsLayoutDesignerDialog *QgisApp::createNewPrintLayout( const QString &t )
   QgsPrintLayout *layout = new QgsPrintLayout( QgsProject::instance() );
   layout->setName( title );
   layout->initializeDefaults();
-  QgsProject::instance()->layoutManager()->addLayout( layout );
-  return openLayoutDesignerDialog( layout );
+  if ( QgsProject::instance()->layoutManager()->addLayout( layout ) )
+    return openLayoutDesignerDialog( layout );
+  else
+    return nullptr;
 }
 
 QgsLayoutDesignerDialog *QgisApp::createNewReport( QString title )

diff --git a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp
@@ -961,8 +961,8 @@ bool QgsProcessingModelAlgorithm::activateChildAlgorithm( const QString &id )
 
 void QgsProcessingModelAlgorithm::addModelParameter( QgsProcessingParameterDefinition *definition, const QgsProcessingModelParameter &component )
 {
-  addParameter( definition );
-  mParameterComponents.insert( definition->name(), component );
+  if ( addParameter( definition ) )
+    mParameterComponents.insert( definition->name(), component );
 }
 
 void QgsProcessingModelAlgorithm::updateModelParameter( QgsProcessingParameterDefinition *definition )