Avoid crash

m-kuhn · m-kuhn · commit f70b5b54657d · 2017-08-12T20:11:11.000+02:00
diff --git a/src/core/geometry/qgscurve.h b/src/core/geometry/qgscurve.h
@@ -145,8 +145,11 @@ class CORE_EXPORT QgsCurve: public QgsAbstractGeometry
      */
     inline const QgsCurve *cast( const QgsAbstractGeometry *geom ) const
     {
+      if ( !geom )
+        return nullptr;
+
       QgsWkbTypes::Type type = geom->wkbType();
-      if ( geom && QgsWkbTypes::geometryType( type ) == QgsWkbTypes::LineGeometry && QgsWkbTypes::isSingleType( type ) )
+      if ( QgsWkbTypes::geometryType( type ) == QgsWkbTypes::LineGeometry && QgsWkbTypes::isSingleType( type ) )
       {
         return static_cast<const QgsCurve *>( geom );
       }

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,11 @@ class CORE_EXPORT QgsCurve: public QgsAbstractGeometry`
`145`	`145`	`*/`
`146`	`146`	`inline const QgsCurve cast( const QgsAbstractGeometry geom ) const`
`147`	`147`	`{`
	`148`	`+ if ( !geom )`
	`149`	`+ return nullptr;`
	`150`	`+`
`148`	`151`	`QgsWkbTypes::Type type = geom->wkbType();`
`149`		`- if ( geom && QgsWkbTypes::geometryType( type ) == QgsWkbTypes::LineGeometry && QgsWkbTypes::isSingleType( type ) )`
	`152`	`+ if ( QgsWkbTypes::geometryType( type ) == QgsWkbTypes::LineGeometry && QgsWkbTypes::isSingleType( type ) )`
`150`	`153`	`{`
`151`	`154`	`return static_cast<const QgsCurve *>( geom );`
`152`	`155`	`}`