Add safety check to QgsGeometry::asPolygon. Fixes possible crash

m-kuhn · m-kuhn · commit 0add85802069 · 2016-02-04T13:35:16.000+01:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1034,6 +1034,9 @@ QgsPolyline QgsGeometry::asPolyline() const
 
 QgsPolygon QgsGeometry::asPolygon() const
 {
+  if ( !d->geometry )
+    return QgsPolygon();
+
   bool doSegmentation = ( d->geometry->geometryType() == "CurvePolygon" );
 
   QgsPolygonV2* p = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -1034,6 +1034,9 @@ QgsPolyline QgsGeometry::asPolyline() const`
`1034`	`1034`
`1035`	`1035`	`QgsPolygon QgsGeometry::asPolygon() const`
`1036`	`1036`	`{`
	`1037`	`+ if ( !d->geometry )`
	`1038`	`+ return QgsPolygon();`
	`1039`	`+`
`1037`	`1040`	`bool doSegmentation = ( d->geometry->geometryType() == "CurvePolygon" );`
`1038`	`1041`
`1039`	`1042`	`QgsPolygonV2* p = nullptr;`