Fix crash when preparing/buffering a polygon fails prior to tessellation

opengisch · Aug 26, 2023 · 4d464e8 · 4d464e8 · qfield-fairy · Aug 26, 2023
1 parent 2cdd146
commit 4d464e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/core/qgssggeometry.cpp b/src/core/qgssggeometry.cpp
@@ -164,9 +164,11 @@ QSGGeometry *QgsSGGeometry::qgsPolygonToQSGGeometry( const QgsPolygon *polygon,
   QgsGeometry geom( polygon->clone() );
   geom = geom.buffer( 0.0000001, 5 );
   QgsPolygon *bufferedPolygon = qgsgeometry_cast<QgsPolygon *>( geom.constGet() );
-
   QgsTessellator t( visibleExtent.xMinimum(), visibleExtent.yMaximum(), false, false, false, true );
-  t.addPolygon( *bufferedPolygon, 0 );
+  if ( bufferedPolygon )
+  {
+    t.addPolygon( *bufferedPolygon, 0 );
+  }
 
   QSGGeometry *sgGeom = new QSGGeometry( QSGGeometry::defaultAttributes_Point2D(), t.dataVerticesCount() );
 

diff --git a/src/core/sgrubberband.cpp b/src/core/sgrubberband.cpp
@@ -112,7 +112,7 @@ QSGGeometryNode *SGRubberband::createPolygonGeometry( const QVector<QgsPoint> &p
   geom = geom.buffer( 0.0000001, 5 );
   QgsPolygon *polygon = qgsgeometry_cast<QgsPolygon *>( geom.constGet() );
   QgsTessellator t( 0, 0, false, false, false, true );
-  if ( points.size() > 2 )
+  if ( points.size() > 2 && polygon )
   {
     t.addPolygon( *polygon, 0 );
   }