[BUGFIX] QgsMSLayerCache: remove layer from QgsMapLayerRegistry befor…

…e delete it In QGIS Server, layers can be added to QgsMapLayerRegistry and delete by QgsMSLayerCache. This means that QgsMapLayerRegistry can have reference to deleted pointers.
qgis · Jun 28, 2016 · d3eb164 · d3eb164 · m-kuhn · Jun 28, 2016
1 parent 7dcb9cc
commit d3eb164
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/server/qgsmslayercache.cpp b/src/server/qgsmslayercache.cpp
@@ -17,6 +17,8 @@
 
 #include "qgsmslayercache.h"
 #include "qgsmessagelog.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsmaplayer.h"
 #include "qgsvectorlayer.h"
 #include "qgslogger.h"
 #include <QFile>
@@ -187,6 +189,10 @@ void QgsMSLayerCache::removeLeastUsedEntry()
 
 void QgsMSLayerCache::freeEntryRessources( QgsMSLayerCacheEntry& entry )
 {
+  // remove layer from QgsMapLayerRegistry before delete it
+  if ( QgsMapLayerRegistry::instance()->mapLayer( entry.layerPointer->id() ) )
+    QgsMapLayerRegistry::instance()->removeMapLayer( entry.layerPointer->id() );
+
   delete entry.layerPointer;
 
   //remove the temporary files of a layer