Merge pull request #1455 from Oslandia/fix_inverted

Inverted polygons: fix memory leaks
qgis · Jun 16, 2014 · 7ed87c6 · 7ed87c6
2 parents 8005eab + 1613d84
commit 7ed87c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -6420,12 +6420,10 @@ QgsGeometry *QgsGeometry::unaryUnion( const QList<QgsGeometry*> &geometryList )
   QList<GEOSGeometry*> geoms;
   foreach( QgsGeometry* g, geometryList )
   {
-    // const cast: it is ok here, since the pointers will only be used to be stored
-    // in a list for a call to union
-    geoms.append( const_cast<GEOSGeometry*>(g->asGeos()) );
+    geoms.append( GEOSGeom_clone(g->asGeos()) );
   }
-  GEOSGeometry* unioned = _makeUnion( geoms );
+  GEOSGeometry *geomUnion = _makeUnion( geoms );
   QgsGeometry *ret = new QgsGeometry();
-  ret->fromGeos( unioned );
+  ret->fromGeos( geomUnion );
   return ret;
 }
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -73,6 +73,7 @@ void QgsInvertedPolygonRenderer::startRender( QgsRenderContext& context, const Q
   mSubRenderer->startRender( context, fields );
 
   mFeaturesCategories.clear();
+  mSymbolCategories.clear();
   mFeatureDecorations.clear();
   mFields = fields;
 
@@ -279,6 +280,13 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
     }
     mSubRenderer->renderFeature( feat, mContext );
   }
+  for ( FeatureCategoryVector::iterator cit = mFeaturesCategories.begin(); cit != mFeaturesCategories.end(); ++cit )
+  {
+    foreach( QgsGeometry* g, cit->geometries )
+    {
+      delete g;
+    }
+  }
 
   // when no features are visible, we still have to draw the exterior rectangle
   // warning: when sub renderers have more than one possible symbols,

diff --git a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
@@ -80,6 +80,8 @@ QgsSingleSymbolRendererV2Widget::~QgsSingleSymbolRendererV2Widget()
   delete mRenderer;
 
   delete mSelector;
+
+  delete mDataDefinedMenus;
 }