Skip to content

Commit d0fb7fe

Browse files
committedFeb 19, 2018
[BUGFIX][Server] WFS GetFeature GML: segfault with geometry null
1 parent 4868e6c commit d0fb7fe

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
@@ -1973,11 +1973,9 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
19731973
typeNameElement.setAttribute( "fid", mTypeName + "." + QString::number( feat->id() ) );
19741974
featureElement.appendChild( typeNameElement );
19751975

1976-
if ( mWithGeom && mGeometryName != "NONE" )
1976+
const QgsGeometry* geom = feat->constGeometry();
1977+
if ( geom && mWithGeom && mGeometryName != "NONE" )
19771978
{
1978-
//add geometry column (as gml)
1979-
const QgsGeometry* geom = feat->constGeometry();
1980-
19811979
QDomElement geomElem = doc.createElement( "qgs:geometry" );
19821980
QDomElement gmlElem;
19831981
if ( mGeometryName == "EXTENT" )
@@ -2057,11 +2055,9 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
20572055
typeNameElement.setAttribute( "gml:id", mTypeName + "." + QString::number( feat->id() ) );
20582056
featureElement.appendChild( typeNameElement );
20592057

2060-
if ( mWithGeom && mGeometryName != "NONE" )
2058+
const QgsGeometry* geom = feat->constGeometry();
2059+
if ( geom && mWithGeom && mGeometryName != "NONE" )
20612060
{
2062-
//add geometry column (as gml)
2063-
const QgsGeometry* geom = feat->constGeometry();
2064-
20652061
QDomElement geomElem = doc.createElement( "qgs:geometry" );
20662062
QDomElement gmlElem;
20672063
if ( mGeometryName == "EXTENT" )

0 commit comments

Comments
 (0)
Please sign in to comment.