sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-19 00:04:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some Coverity null pointer dereference warnings

Browse Source
This commit is contained in:
Nyall Dawson 2017-09-01 07:54:20 +10:00
parent 9a07cd513a
commit e7ddfff09d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/qgsattributeform.cpp
View File

@ -2037,7 +2037,7 @@ bool QgsAttributeForm::fieldIsEditable( int fieldIndex ) const
int srcFieldIndex; int srcFieldIndex;
const QgsVectorLayerJoinInfo *info = mLayer->joinBuffer()->joinForFieldIndex( fieldIndex, mLayer->fields(), srcFieldIndex ); const QgsVectorLayerJoinInfo *info = mLayer->joinBuffer()->joinForFieldIndex( fieldIndex, mLayer->fields(), srcFieldIndex );
if ( !info->hasUpsertOnEdit() && mMode == QgsAttributeForm::AddFeatureMode ) if ( info && !info->hasUpsertOnEdit() && mMode == QgsAttributeForm::AddFeatureMode )
editable = false; editable = false;
else if ( info && info->isEditable() && info->joinLayer()->isEditable() ) else if ( info && info->isEditable() && info->joinLayer()->isEditable() )
editable = fieldIsEditable( *( info->joinLayer() ), srcFieldIndex, mFeature.id() ); editable = fieldIsEditable( *( info->joinLayer() ), srcFieldIndex, mFeature.id() );

2
src/providers/ogr/qgsgeopackagedataitems.cpp
View File

@ -383,7 +383,7 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct
{ {
if ( isVector ) // Import vectors and aspatial if ( isVector ) // Import vectors and aspatial
{ {
QgsVectorLayer *vectorSrcLayer = dynamic_cast < QgsVectorLayer * >( srcLayer ); QgsVectorLayer *vectorSrcLayer = qobject_cast < QgsVectorLayer * >( srcLayer );
QVariantMap options; QVariantMap options;
options.insert( QStringLiteral( "driverName" ), QStringLiteral( "GPKG" ) ); options.insert( QStringLiteral( "driverName" ), QStringLiteral( "GPKG" ) );
options.insert( QStringLiteral( "update" ), true ); options.insert( QStringLiteral( "update" ), true );