Merge pull request #8331 from rldhont/fix-server-wfs-force-multi-geom…

…-gml-218 [Bugfix][Server][WFS] Segfault when converting geom to multi
qgis · Oct 26, 2018 · daa650e · daa650e
2 parents 75a170d + 81f4bdb
commit daa650e
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -2070,12 +2070,11 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
   typeNameElement.setAttribute( "fid", mTypeName + "." + gmlId );
   featureElement.appendChild( typeNameElement );
 
-  const QgsGeometry* geom = feat->constGeometry();
+  const QgsGeometry* cGeom = feat->constGeometry();
+  QgsGeometry *geom = new QgsGeometry( *cGeom );
   if ( isMultiGeom && QgsWKBTypes::isSingleType( QGis::fromOldWkbType( geom->wkbType() ) ) )
   {
-    QgsGeometry cloneGeom( *geom );
-    cloneGeom.convertToMultiType();
-    geom = &cloneGeom;
+    geom->convertToMultiType();
   }
   if ( geom && mWithGeom && mGeometryName != "NONE" )
   {
@@ -2121,6 +2120,7 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
       typeNameElement.appendChild( geomElem );
     }
   }
+  delete geom;
 
   //read all attribute values from the feature
   QgsAttributes featureAttributes = feat->attributes();
@@ -2160,12 +2160,12 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
   typeNameElement.setAttribute( "gml:id", mTypeName + "." + gmlId );
   featureElement.appendChild( typeNameElement );
 
-  const QgsGeometry* geom = feat->constGeometry();
+
+  const QgsGeometry* cGeom = feat->constGeometry();
+  QgsGeometry *geom = new QgsGeometry( *cGeom );
   if ( isMultiGeom && QgsWKBTypes::isSingleType( QGis::fromOldWkbType( geom->wkbType() ) ) )
   {
-    QgsGeometry cloneGeom( *geom );
-    cloneGeom.convertToMultiType();
-    geom = &cloneGeom;
+    geom->convertToMultiType();
   }
   if ( geom && mWithGeom && mGeometryName != "NONE" )
   {
@@ -2211,6 +2211,7 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
       typeNameElement.appendChild( geomElem );
     }
   }
+  delete geom;
 
   //read all attribute values from the feature
   QgsAttributes featureAttributes = feat->attributes();