Skip to content

Commit 3db0569

Browse files
committed
Fix some Coverity use-after-free warnings
(cherry-picked from eb39579)
1 parent 2900ae2 commit 3db0569

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/app/qgisapp.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -7368,8 +7368,10 @@ QgsLayoutDesignerDialog *QgisApp::createNewPrintLayout( const QString &t )
73687368
QgsPrintLayout *layout = new QgsPrintLayout( QgsProject::instance() );
73697369
layout->setName( title );
73707370
layout->initializeDefaults();
7371-
QgsProject::instance()->layoutManager()->addLayout( layout );
7372-
return openLayoutDesignerDialog( layout );
7371+
if ( QgsProject::instance()->layoutManager()->addLayout( layout ) )
7372+
return openLayoutDesignerDialog( layout );
7373+
else
7374+
return nullptr;
73737375
}
73747376

73757377
QgsLayoutDesignerDialog *QgisApp::createNewReport( QString title )

src/core/processing/models/qgsprocessingmodelalgorithm.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,8 @@ bool QgsProcessingModelAlgorithm::activateChildAlgorithm( const QString &id )
961961

962962
void QgsProcessingModelAlgorithm::addModelParameter( QgsProcessingParameterDefinition *definition, const QgsProcessingModelParameter &component )
963963
{
964-
addParameter( definition );
965-
mParameterComponents.insert( definition->name(), component );
964+
if ( addParameter( definition ) )
965+
mParameterComponents.insert( definition->name(), component );
966966
}
967967

968968
void QgsProcessingModelAlgorithm::updateModelParameter( QgsProcessingParameterDefinition *definition )

0 commit comments

Comments
 (0)