new labeling: do not crash on invalid geometries

wonder · wonder · commit 1a72da7dba24 · 2010-08-06T13:29:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14018 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -416,6 +416,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   }
 
   QgsGeometry* geom = f.geometry();
+  GEOSGeometry* geos_geom = geom->asGeos();
+  if ( geos_geom == NULL )
+    return; // invalid geometry
+
   if ( ct != NULL ) // reproject the geometry if necessary
     geom->transform( *ct );
 
@@ -424,7 +428,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
     return;
   }
 
-  QgsPalGeometry* lbl = new QgsPalGeometry( f.id(), labelText, GEOSGeom_clone( geom->asGeos() ) );
+  QgsPalGeometry* lbl = new QgsPalGeometry( f.id(), labelText, GEOSGeom_clone( geos_geom ) );
 
   // record the created geometry - it will be deleted at the end.
   geometries.append( lbl );
