Fix crash using QgsGeometryCollection::vertexAt with empty geometry

qgis · Apr 18, 2023 · ffbb8f4 · ffbb8f4
1 parent e5a9b26
commit ffbb8f4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/core/geometry/qgsgeometrycollection.cpp b/src/core/geometry/qgsgeometrycollection.cpp
@@ -898,7 +898,18 @@ int QgsGeometryCollection::partCount() const
 
 QgsPoint QgsGeometryCollection::vertexAt( QgsVertexId id ) const
 {
-  return mGeometries[id.part]->vertexAt( id );
+  if ( id.part < 0 || id.part >= mGeometries.size() )
+  {
+    return QgsPoint();
+  }
+
+  const QgsAbstractGeometry *geom = mGeometries[id.part];
+  if ( !geom )
+  {
+    return QgsPoint();
+  }
+
+  return geom->vertexAt( id );
 }
 
 bool QgsGeometryCollection::isValid( QString &error, Qgis::GeometryValidityFlags flags ) const