Skip to content

Commit 2481ce6

Browse files
committed
Coverity fixes (uninitialised members, uncaught exceptions)
1 parent d8b715a commit 2481ce6

File tree

4 files changed

+37
-2
lines changed

4 files changed

+37
-2
lines changed

src/app/qgisapp.cpp

+16
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,22 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
841841

842842
QgisApp::QgisApp()
843843
: QMainWindow( 0, 0 )
844+
, mStyleSheetBuilder( 0 )
845+
, mActionPluginSeparator1( 0 )
846+
, mActionPluginSeparator2( 0 )
847+
, mActionRasterSeparator( 0 )
848+
, mMapToolGroup( 0 )
849+
, mPreviewGroup( 0 )
850+
#ifdef Q_OS_MAC
851+
, mWindowMenu( 0 )
852+
#endif
853+
, mPanelMenu( 0 )
854+
, mToolbarMenu( 0 )
855+
, mLayerTreeDock( 0 )
856+
, mLayerOrderDock( 0 )
857+
, mOverviewDock( 0 )
858+
, mpGpsDock( 0 )
859+
, mLogDock( 0 )
844860
, mNonEditMapTool( 0 )
845861
, mScaleLabel( 0 )
846862
, mScaleEdit( 0 )

src/providers/spatialite/qgsspatialiteprovider.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
420420
, geomType( QGis::WKBUnknown )
421421
, sqliteHandle( NULL )
422422
, mSrid( -1 )
423+
, numberFeatures( 0 )
423424
, spatialIndexRTree( false )
424425
, spatialIndexMbrCache( false )
425426
, enabledCapabilities( 0 )

src/server/qgswcsprojectparser.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,17 @@ void QgsWCSProjectParser::describeCoverage( const QString& aCoveName, QDomElemen
243243
const QgsCoordinateReferenceSystem& layerCrs = rLayer->crs();
244244
QgsCoordinateTransform t( layerCrs, QgsCoordinateReferenceSystem( 4326 ) );
245245
//transform
246-
QgsRectangle BBox = t.transformBoundingBox( rLayer->extent() );
246+
QgsRectangle BBox = rLayer->extent();
247+
try
248+
{
249+
QgsRectangle transformedBox = t.transformBoundingBox( BBox );
250+
BBox = transformedBox;
251+
}
252+
catch ( QgsCsException &e )
253+
{
254+
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
255+
}
256+
247257
QDomElement lonLatElem = doc.createElement( "lonLatEnvelope" );
248258
lonLatElem.setAttribute( "srsName", "urn:ogc:def:crs:OGC:1.3:CRS84" );
249259
QDomElement lowerPosElem = doc.createElement( "gml:pos" );

src/server/qgswmsserver.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -2954,7 +2954,15 @@ QDomElement QgsWMSServer::createFeatureGML(
29542954
QgsRectangle box = feat->geometry()->boundingBox();
29552955
if ( transform )
29562956
{
2957-
box = transform->transformBoundingBox( box );
2957+
try
2958+
{
2959+
QgsRectangle transformedBox = transform->transformBoundingBox( box );
2960+
box = transformedBox;
2961+
}
2962+
catch ( QgsCsException &e )
2963+
{
2964+
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
2965+
}
29582966
}
29592967

29602968
QDomElement bbElem = doc.createElement( "gml:boundedBy" );

0 commit comments

Comments
 (0)