Fix potential crash in QgsGeometry::smooth

nyalldawson · nyalldawson · commit 60f81bd1baf8 · 2017-09-25T17:20:36.000+10:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -2669,7 +2669,7 @@ bool QgsGeometry::compare( const QgsMultiPolygon &p1, const QgsMultiPolygon &p2,
 
 QgsGeometry QgsGeometry::smooth( const unsigned int iterations, const double offset, double minimumDistance, double maxAngle ) const
 {
-  if ( d->geometry->isEmpty() )
+  if ( !d->geometry || d->geometry->isEmpty() )
     return QgsGeometry();
 
   QgsGeometry geom = *this;

Original file line number	Diff line number	Diff line change
`@@ -2669,7 +2669,7 @@ bool QgsGeometry::compare( const QgsMultiPolygon &p1, const QgsMultiPolygon &p2,`
`2669`	`2669`
`2670`	`2670`	`QgsGeometry QgsGeometry::smooth( const unsigned int iterations, const double offset, double minimumDistance, double maxAngle ) const`
`2671`	`2671`	`{`
`2672`		`- if ( d->geometry->isEmpty() )`
	`2672`	`+ if ( !d->geometry \|\| d->geometry->isEmpty() )`
`2673`	`2673`	`return QgsGeometry();`
`2674`	`2674`
`2675`	`2675`	`QgsGeometry geom = *this;`