[BUGFIX][Server] Segfault when GetFeatureInfo on Raster layer to GML

rldhont · rldhont · commit 21d15e710112 · 2018-06-01T10:56:26.000+02:00
The PR #6279 has introduced some bug, like a segfault when a WMS GetFeatureInfo is done on a Raster layer with output to GML. This commit fixes it.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -3322,7 +3322,9 @@ QDomElement QgsWMSServer::createFeatureGML(
 {
   //qgs:%TYPENAME%
   QDomElement typeNameElement = doc.createElement( "qgs:" + typeName /*qgs:%TYPENAME%*/ );
-  QString gmlId = featureGmlId( feat, layer->dataProvider()->pkAttributeIndexes() );
+  QString gmlId = QString::number( feat->id() );
+  if ( layer ) // For raster layer, layer is null
+    gmlId = featureGmlId( feat, layer->dataProvider()->pkAttributeIndexes() );
   typeNameElement.setAttribute( "fid", typeName + "." + gmlId );
 
   const QgsCoordinateTransform* transform = nullptr;
