Skip to content

Commit 1e97b62

Browse files
committed
coverity fixes
1 parent fc22bf1 commit 1e97b62

4 files changed

Lines changed: 17 additions & 11 deletions

File tree

src/app/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,10 @@ static void dumpBacktrace( unsigned int depth )
226226
{
227227
int status;
228228
close( STDERR_FILENO );
229-
if ( dup( stderr_fd ) != STDERR_FILENO )
229+
int dup_stderr = dup( stderr_fd );
230+
if ( dup_stderr != STDERR_FILENO )
230231
{
232+
close( dup_stderr );
231233
QgsDebugMsg( "dup to stderr failed" );
232234
}
233235
close( stderr_fd );

src/providers/wms/qgswmsprovider.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
486486
mCachedViewWidth = pixelWidth;
487487
mCachedViewHeight = pixelHeight;
488488

489-
if ( !mSettings.mTiled && !mSettings.mMaxWidth && !mSettings.mMaxHeight )
489+
if ( !mSettings.mTiled && mSettings.mMaxWidth == 0 && mSettings.mMaxHeight == 0 )
490490
{
491491
// Calculate active layers that are also visible.
492492

@@ -559,7 +559,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
559559
//t.start();
560560

561561
}
562-
else
562+
else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight != 0 )
563563
{
564564
mTileReqNo++;
565565

@@ -831,6 +831,10 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
831831
);
832832
#endif
833833
}
834+
else
835+
{
836+
QgsDebugMsg( "empty tile size" );
837+
}
834838

835839
return mCachedImage;
836840
}

src/server/qgswfsserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
13561356
// Store the created feature id for WFS
13571357
QStringList insertResults;
13581358
// Get the WFS layers id
1359-
QStringList wfsLayersId = mConfigParser->wfsLayers();
1359+
QStringList wfsLayersId = mConfigParser ? mConfigParser->wfsLayers() : QStringList();
13601360

13611361
QList<QgsMapLayer*> layerList;
13621362
QgsMapLayer* currentLayer = 0;
@@ -1373,7 +1373,7 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
13731373
currentLayer = layerList.at( 0 );
13741374

13751375
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
1376-
// it's a vectorlayer and definy by the administrator as a WFS layer
1376+
// it's a vectorlayer and defined by the administrator as a WFS layer
13771377
if ( layer && wfsLayersId.contains( layer->id() ) )
13781378
{
13791379
// Get the provider and it's capabilities

src/server/qgswmsserver.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
15171517
else
15181518
{
15191519
layerElement = result.createElement( "Layer" );
1520-
QString layerName = mConfigParser->useLayerIDs() ? currentLayer->id() : currentLayer->name();
1520+
QString layerName = mConfigParser && mConfigParser->useLayerIDs() ? currentLayer->id() : currentLayer->name();
15211521

15221522
//check if the layer is given a different name for GetFeatureInfo output
15231523
QHash<QString, QString>::const_iterator layerAliasIt = layerAliasMap.find( layerName );
@@ -2068,7 +2068,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
20682068
{
20692069
bool withGeom = layer->wkbType() != QGis::WKBNoGeometry && addWktGeometry;
20702070
int version = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
2071-
QDomElement elem = createFeatureGML( &feature, layer, infoDocument, outputCrs, mConfigParser->useLayerIDs() ? layer->id() : layer->name(), withGeom, version );
2071+
QDomElement elem = createFeatureGML( &feature, layer, infoDocument, outputCrs, mConfigParser && mConfigParser->useLayerIDs() ? layer->id() : layer->name(), withGeom, version );
20722072
QDomElement featureMemberElem = infoDocument.createElement( "gml:featureMember"/*wfs:FeatureMember*/ );
20732073
featureMemberElem.appendChild( elem );
20742074
layerElement.appendChild( featureMemberElem );
@@ -2202,7 +2202,7 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,
22022202

22032203
QgsCoordinateReferenceSystem layerCrs = layer->crs();
22042204
int version = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
2205-
QDomElement elem = createFeatureGML( &feature, 0, infoDocument, layerCrs, mConfigParser->useLayerIDs() ? layer->id() : layer->name(), false, version );
2205+
QDomElement elem = createFeatureGML( &feature, 0, infoDocument, layerCrs, mConfigParser && mConfigParser->useLayerIDs() ? layer->id() : layer->name(), false, version );
22062206
layerElement.appendChild( elem );
22072207
}
22082208
else
@@ -2254,7 +2254,7 @@ QStringList QgsWMSServer::layerSet( const QStringList &layersList,
22542254
theMapLayer = layerList.at( listIndex );
22552255
if ( theMapLayer )
22562256
{
2257-
QgsDebugMsg( QString( "Checking layer: %1" ).arg( mConfigParser->useLayerIDs() ? theMapLayer->id() : theMapLayer->name() ) );
2257+
QgsDebugMsg( QString( "Checking layer: %1" ).arg( mConfigParser && mConfigParser->useLayerIDs() ? theMapLayer->id() : theMapLayer->name() ) );
22582258
//test if layer is visible in requested scale
22592259
bool useScaleConstraint = ( scaleDenominator > 0 && theMapLayer->hasScaleBasedVisibility() );
22602260
if ( !useScaleConstraint ||
@@ -2317,7 +2317,7 @@ QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringLi
23172317

23182318
foreach ( QgsMapLayer *layer, QgsMapLayerRegistry::instance()->mapLayers() )
23192319
{
2320-
if ( layer && ( mConfigParser->useLayerIDs() ? layer->id() : layer->name() ) == eqSplit.at( 0 ) )
2320+
if ( layer && ( mConfigParser && mConfigParser->useLayerIDs() ? layer->id() : layer->name() ) == eqSplit.at( 0 ) )
23212321
{
23222322
layersToFilter.push_back( layer );
23232323
}
@@ -2542,7 +2542,7 @@ QStringList QgsWMSServer::applyFeatureSelections( const QStringList& layerList )
25422542

25432543
foreach ( QgsMapLayer *layer, QgsMapLayerRegistry::instance()->mapLayers() )
25442544
{
2545-
if ( layer && ( mConfigParser->useLayerIDs() ? layer->id() : layer->name() ) == layerName )
2545+
if ( layer && ( mConfigParser && mConfigParser->useLayerIDs() ? layer->id() : layer->name() ) == layerName )
25462546
{
25472547
vLayer = qobject_cast<QgsVectorLayer*>( layer );
25482548
layersWithSelections.push_back( vLayer->id() );

0 commit comments

Comments
 (0)