fix diagram crash (fixes #15575) (#3504)

qgis · Sep 19, 2016 · 9264be8 · 9264be8
1 parent 347a8c9
commit 9264be8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp
@@ -229,13 +229,14 @@ QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& fea
   }
 
   const GEOSGeometry* geos_geom = nullptr;
-  QScopedPointer<QgsGeometry> preparedGeom;
+  QScopedPointer<QgsGeometry> scopedPreparedGeom;
   if ( QgsPalLabeling::geometryRequiresPreparation( geom, context, mSettings.coordinateTransform(), &extentGeom ) )
   {
-    QgsGeometry preparedGeom = QgsPalLabeling::prepareGeometry( geom, context, mSettings.coordinateTransform(), &extentGeom );
-    if ( preparedGeom.isEmpty() )
+    scopedPreparedGeom.reset( new QgsGeometry( QgsPalLabeling::prepareGeometry( geom, context, mSettings.coordinateTransform(), &extentGeom ) ) );
+    QgsGeometry* preparedGeom = scopedPreparedGeom.data();
+    if ( preparedGeom->isEmpty() )
       return nullptr;
-    geos_geom = preparedGeom.asGeos();
+    geos_geom = preparedGeom->asGeos();
   }
   else
   {