[BUGFIX][Server] Segfault in WFS GetCapabilities

rldhont · rldhont · commit c625f95befdc · 2018-04-10T13:55:50.000+02:00
diff --git a/src/server/services/wfs/qgswfsgetcapabilities.cpp b/src/server/services/wfs/qgswfsgetcapabilities.cpp
@@ -421,6 +421,10 @@ namespace QgsWfs
     for ( const QString &wfsLayerId : wfsLayerIds )
     {
       QgsMapLayer *layer = project->mapLayer( wfsLayerId );
+      if ( !layer )
+      {
+        continue;
+      }
       if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
       {
         continue;
diff --git a/src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp b/src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp
@@ -266,6 +266,10 @@ namespace QgsWfs
       for ( const QString &wfsLayerId : wfsLayerIds )
       {
         QgsMapLayer *layer = project->mapLayer( wfsLayerId );
+        if ( !layer )
+        {
+          continue;
+        }
         if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
         {
           continue;

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,10 @@ namespace QgsWfs`
`421`	`421`	`for ( const QString &wfsLayerId : wfsLayerIds )`
`422`	`422`	`{`
`423`	`423`	`QgsMapLayer *layer = project->mapLayer( wfsLayerId );`
	`424`	`+ if ( !layer )`
	`425`	`+ {`
	`426`	`+ continue;`
	`427`	`+ }`
`424`	`428`	`if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )`
`425`	`429`	`{`
`426`	`430`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,10 @@ namespace QgsWfs`
`266`	`266`	`for ( const QString &wfsLayerId : wfsLayerIds )`
`267`	`267`	`{`
`268`	`268`	`QgsMapLayer *layer = project->mapLayer( wfsLayerId );`
	`269`	`+ if ( !layer )`
	`270`	`+ {`
	`271`	`+ continue;`
	`272`	`+ }`
`269`	`273`	`if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )`
`270`	`274`	`{`
`271`	`275`	`continue;`