sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

[symbology] Fix potential crash with data defined symbols

Browse Source
This commit is contained in:
Nyall Dawson 2015-05-09 17:37:50 +10:00
parent 46b9029e0f
commit 65cd9fcd78
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/symbology-ng/qgssymbollayerv2.cpp
View File

@ -117,7 +117,9 @@ QVariant QgsSymbolLayerV2::evaluateDataDefinedProperty( const QString &property,
return QVariant();
if ( dd->useExpression() )
return dd->expression()->evaluate( feature );
{
return dd->expression() ? dd->expression()->evaluate( feature ) : QVariant();
}
else if ( feature && !dd->field().isEmpty() && !mFields.isEmpty() )
{
int attributeIndex = mFields.fieldNameIndex( dd->field() );