Fix #9501 (expression crash when $geometry is used without a feature)

wonder-sk · wonder-sk · commit 18fd4011677f · 2014-02-08T19:21:23.000+07:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -976,7 +976,7 @@ static QVariant fcnYat( const QVariantList& values, const QgsFeature* f, QgsExpr
 }
 static QVariant fcnGeometry( const QVariantList& , const QgsFeature* f, QgsExpression* )
 {
-  QgsGeometry* geom = f->geometry();
+  QgsGeometry* geom = f ? f->geometry() : 0;
   if ( geom )
     return  QVariant::fromValue( *geom );
   else

Original file line number	Diff line number	Diff line change
`@@ -976,7 +976,7 @@ static QVariant fcnYat( const QVariantList& values, const QgsFeature* f, QgsExpr`
`976`	`976`	`}`
`977`	`977`	`static QVariant fcnGeometry( const QVariantList& , const QgsFeature* f, QgsExpression* )`
`978`	`978`	`{`
`979`		`- QgsGeometry* geom = f->geometry();`
	`979`	`+ QgsGeometry* geom = f ? f->geometry() : 0;`
`980`	`980`	`if ( geom )`
`981`	`981`	`return QVariant::fromValue( *geom );`
`982`	`982`	`else`