Fixed a segfault when a function has no arguments

qgis · Aug 29, 2011 · e32acf5 · e32acf5
1 parent 7e68770
commit e32acf5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -850,9 +850,12 @@ QVariant QgsExpression::NodeFunction::eval( QgsExpression* parent, QgsFeature* f
 bool QgsExpression::NodeFunction::prepare( QgsExpression* parent, const QgsFieldMap& fields )
 {
   bool res = true;
-  foreach( Node* n, mArgs->list() )
+  if ( mArgs )
   {
-    res = res && n->prepare( parent, fields );
+    foreach( Node* n, mArgs->list() )
+    {
+      res = res && n->prepare( parent, fields );
+    }
   }
   return res;
 }
@@ -863,7 +866,7 @@ QString QgsExpression::NodeFunction::dump() const
   if ( fd.mParams == 0 )
     return fd.mName; // special column
   else
-    return QString( "%1(%2)" ).arg( fd.mName ).arg( mArgs->dump() ); // function
+    return QString( "%1(%2)" ).arg( fd.mName ).arg( mArgs ? mArgs->dump() : QString() ); // function
 }
 
 //