Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[BUGFIX][Server] WFS GetFeature GML: segfault with geometry null
  • Loading branch information
rldhont committed Feb 19, 2018
1 parent 8491b1b commit decb722
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions src/server/qgswfsserver.cpp
Expand Up @@ -1984,11 +1984,9 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
typeNameElement.setAttribute( "fid", mTypeName + "." + QString::number( feat->id() ) );
featureElement.appendChild( typeNameElement );

if ( mWithGeom && mGeometryName != "NONE" )
const QgsGeometry* geom = feat->constGeometry();
if ( geom && mWithGeom && mGeometryName != "NONE" )
{
//add geometry column (as gml)
const QgsGeometry* geom = feat->constGeometry();

QDomElement geomElem = doc.createElement( "qgs:geometry" );
QDomElement gmlElem;
if ( mGeometryName == "EXTENT" )
Expand Down Expand Up @@ -2068,11 +2066,9 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
typeNameElement.setAttribute( "gml:id", mTypeName + "." + QString::number( feat->id() ) );
featureElement.appendChild( typeNameElement );

if ( mWithGeom && mGeometryName != "NONE" )
const QgsGeometry* geom = feat->constGeometry();
if ( geom && mWithGeom && mGeometryName != "NONE" )
{
//add geometry column (as gml)
const QgsGeometry* geom = feat->constGeometry();

QDomElement geomElem = doc.createElement( "qgs:geometry" );
QDomElement gmlElem;
if ( mGeometryName == "EXTENT" )
Expand Down

0 comments on commit decb722

Please sign in to comment.