[labeling] Ensure invalid rings are stripped from input geometries in…

… multipolygons before handing to pal Fixes potential crash during labeling with complex coordinate transforms Fixes #46727
qgis · Jan 11, 2022 · 8f3f446 · 8f3f446
1 parent ee345f3
commit 8f3f446
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/core/labeling/qgspallabeling.cpp b/src/core/labeling/qgspallabeling.cpp
@@ -56,7 +56,7 @@
 #include "qgsvectorlayerlabeling.h"
 #include "qgstextrendererutils.h"
 #include "qgstextfragment.h"
-
+#include "qgsmultisurface.h"
 #include "qgslogger.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
@@ -3807,7 +3807,17 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen
       return std::isfinite( point.x() ) && std::isfinite( point.y() );
     } );
     if ( QgsCurvePolygon *cp = qgsgeometry_cast< QgsCurvePolygon * >( geom.get() ) )
+    {
       cp->removeInvalidRings();
+    }
+    else if ( QgsMultiSurface *ms = qgsgeometry_cast< QgsMultiSurface * >( geom.get() ) )
+    {
+      for ( int i = 0; i < ms->numGeometries(); ++i )
+      {
+        if ( QgsCurvePolygon *cp = qgsgeometry_cast< QgsCurvePolygon * >( ms->geometryN( i ) ) )
+          cp->removeInvalidRings();
+      }
+    }
   }
 
   // Rotate the geometry if needed, before clipping