Skip to content

Commit decb722

Browse files
committed
[BUGFIX][Server] WFS GetFeature GML: segfault with geometry null
1 parent 8491b1b commit decb722

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/server/qgswfsserver.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,11 +1984,9 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
19841984
typeNameElement.setAttribute( "fid", mTypeName + "." + QString::number( feat->id() ) );
19851985
featureElement.appendChild( typeNameElement );
19861986

1987-
if ( mWithGeom && mGeometryName != "NONE" )
1987+
const QgsGeometry* geom = feat->constGeometry();
1988+
if ( geom && mWithGeom && mGeometryName != "NONE" )
19881989
{
1989-
//add geometry column (as gml)
1990-
const QgsGeometry* geom = feat->constGeometry();
1991-
19921990
QDomElement geomElem = doc.createElement( "qgs:geometry" );
19931991
QDomElement gmlElem;
19941992
if ( mGeometryName == "EXTENT" )
@@ -2068,11 +2066,9 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
20682066
typeNameElement.setAttribute( "gml:id", mTypeName + "." + QString::number( feat->id() ) );
20692067
featureElement.appendChild( typeNameElement );
20702068

2071-
if ( mWithGeom && mGeometryName != "NONE" )
2069+
const QgsGeometry* geom = feat->constGeometry();
2070+
if ( geom && mWithGeom && mGeometryName != "NONE" )
20722071
{
2073-
//add geometry column (as gml)
2074-
const QgsGeometry* geom = feat->constGeometry();
2075-
20762072
QDomElement geomElem = doc.createElement( "qgs:geometry" );
20772073
QDomElement gmlElem;
20782074
if ( mGeometryName == "EXTENT" )

0 commit comments

Comments
 (0)