Fixed a segfault when a function has no arguments

wonder-sk · wonder-sk · commit e32acf53f8cf · 2011-08-29T21:31:31.000+02:00
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
 }
 
 //

Original file line number	Diff line number	Diff line change
`@@ -850,9 +850,12 @@ QVariant QgsExpression::NodeFunction::eval( QgsExpression* parent, QgsFeature* f`
`850`	`850`	`bool QgsExpression::NodeFunction::prepare( QgsExpression* parent, const QgsFieldMap& fields )`
`851`	`851`	`{`
`852`	`852`	`bool res = true;`
`853`		`- foreach( Node* n, mArgs->list() )`
	`853`	`+ if ( mArgs )`
`854`	`854`	`{`
`855`		`- res = res && n->prepare( parent, fields );`
	`855`	`+ foreach( Node* n, mArgs->list() )`
	`856`	`+ {`
	`857`	`+ res = res && n->prepare( parent, fields );`
	`858`	`+ }`
`856`	`859`	`}`
`857`	`860`	`return res;`
`858`	`861`	`}`
`@@ -863,7 +866,7 @@ QString QgsExpression::NodeFunction::dump() const`
`863`	`866`	`if ( fd.mParams == 0 )`
`864`	`867`	`return fd.mName; // special column`
`865`	`868`	`else`
`866`		`- return QString( "%1(%2)" ).arg( fd.mName ).arg( mArgs->dump() ); // function`
	`869`	`+ return QString( "%1(%2)" ).arg( fd.mName ).arg( mArgs ? mArgs->dump() : QString() ); // function`
`867`	`870`	`}`
`868`	`871`
`869`	`872`	`//`