expression: validate places value of format_number (fixes #12796)

jef-n · jef-n · commit 518072e9b319 · 2015-06-01T20:19:49.000+02:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1345,6 +1345,11 @@ static QVariant fcnFormatNumber( const QVariantList& values, const QgsFeature*,
 {
   double value = getDoubleValue( values.at( 0 ), parent );
   int places = getIntValue( values.at( 1 ), parent );
+  if ( places < 0 )
+  {
+    parent->setEvalErrorString( QObject::tr( "Number of places must be positive" ) );
+    return QVariant();
+  }
   return QString( "%L1" ).arg( value, 0, 'f', places );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1345,6 +1345,11 @@ static QVariant fcnFormatNumber( const QVariantList& values, const QgsFeature*,`
`1345`	`1345`	`{`
`1346`	`1346`	`double value = getDoubleValue( values.at( 0 ), parent );`
`1347`	`1347`	`int places = getIntValue( values.at( 1 ), parent );`
	`1348`	`+ if ( places < 0 )`
	`1349`	`+ {`
	`1350`	`+ parent->setEvalErrorString( QObject::tr( "Number of places must be positive" ) );`
	`1351`	`+ return QVariant();`
	`1352`	`+ }`
`1348`	`1353`	`return QString( "%L1" ).arg( value, 0, 'f', places );`
`1349`	`1354`	`}`
`1350`	`1355`