Add zero pointer checks to avoid segfaults

mhugent · mhugent · commit 05cdd5247a34 · 2011-09-06T09:13:23.000+02:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -495,6 +495,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   }
 
   QgsGeometry* geom = f.geometry();
+  if ( !geom )
+  {
+    return;
+  }
 
   if ( ct ) // reproject the geometry if necessary
     geom->transform( *ct );
@@ -511,6 +515,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   if ( do_clip )
   {
     geomClipped = geom->intersection( extentGeom ); // creates new geometry
+    if ( !geomClipped )
+    {
+      return;
+    }
     geos_geom = geomClipped->asGeos();
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`QgsGeometry* geom = f.geometry();`
	`498`	`+ if ( !geom )`
	`499`	`+ {`
	`500`	`+ return;`
	`501`	`+ }`
`498`	`502`
`499`	`503`	`if ( ct ) // reproject the geometry if necessary`
`500`	`504`	`geom->transform( *ct );`
`@@ -511,6 +515,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`511`	`515`	`if ( do_clip )`
`512`	`516`	`{`
`513`	`517`	`geomClipped = geom->intersection( extentGeom ); // creates new geometry`
	`518`	`+ if ( !geomClipped )`
	`519`	`+ {`
	`520`	`+ return;`
	`521`	`+ }`
`514`	`522`	`geos_geom = geomClipped->asGeos();`
`515`	`523`	`}`
`516`	`524`	`else`