From 18fd4011677fc4c64e3543d20d7e0bb451bb285a Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Sat, 8 Feb 2014 19:21:23 +0700
Subject: [PATCH] Fix #9501 (expression crash when $geometry is used without a
 feature)

---
 src/core/qgsexpression.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index ea71af531639..5eeb4dc6589b 100644
--- 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