avoid memory leak

ahuarte47 · ahuarte47 · commit ea34befe7ce1 · 2014-06-14T01:34:20.000+02:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1944,11 +1944,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
     do_clip = !extentGeom->contains( geom );
     if ( do_clip )
     {
-      geom = geom->intersection( extentGeom ); // creates new geometry
-      if ( !geom )
+      QgsGeometry* clipGeom = geom->intersection( extentGeom ); // creates new geometry
+      if ( !clipGeom )
       {
         return;
       }
+      geom = clipGeom;
+      clonedGeometry.reset( geom );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1944,11 +1944,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1944`	`1944`	`do_clip = !extentGeom->contains( geom );`
`1945`	`1945`	`if ( do_clip )`
`1946`	`1946`	`{`
`1947`		`- geom = geom->intersection( extentGeom ); // creates new geometry`
`1948`		`- if ( !geom )`
	`1947`	`+ QgsGeometry* clipGeom = geom->intersection( extentGeom ); // creates new geometry`
	`1948`	`+ if ( !clipGeom )`
`1949`	`1949`	`{`
`1950`	`1950`	`return;`
`1951`	`1951`	`}`
	`1952`	`+ geom = clipGeom;`
	`1953`	`+ clonedGeometry.reset( geom );`
`1952`	`1954`	`}`
`1953`	`1955`	`}`
`1954`	`1956`