[BUGFIX][Server] WFS GetFeature GML: segfault with geometry null

qgis · Feb 19, 2018 · decb722ee6ae38f16a777a88948f3c62263fae34 · decb722
1 parent 8491b1b
commit decb722ee6ae38f16a777a88948f3c62263fae34
Unified Split

Showing with 4 additions and 8 deletions.

+4 −8 src/server/qgswfsserver.cpp
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -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" )
@@ -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" )