Coverity null dereference fixes

nyalldawson · nyalldawson · commit ae0d377cd262 · 2015-10-05T10:04:36.000+11:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -862,14 +862,14 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
   //color
   QColor pc = mPen.color();
   QColor bc = mBrush.color();
-  if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR ) )
+  if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR ) )
   {
     context->setOriginalValueVariable( QgsSymbolLayerV2Utils::encodeColor( bc ) );
     QString colorString = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR, *context, QVariant(), &ok ).toString();
     if ( ok )
       bc = QgsSymbolLayerV2Utils::decodeColor( colorString );
   }
-  if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER ) )
+  if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER ) )
   {
     context->setOriginalValueVariable( QgsSymbolLayerV2Utils::encodeColor( pc ) );
     QString colorString = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER, *context, QVariant(), &ok ).toString();
@@ -895,7 +895,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
   }
 
   QString name( mName );
-  if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME ) )
+  if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME ) )
   {
     context->setOriginalValueVariable( mName );
     name = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME, *context, QVariant(), &ok ).toString();

Original file line number	Diff line number	Diff line change
`@@ -862,14 +862,14 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc`
`862`	`862`	`//color`
`863`	`863`	`QColor pc = mPen.color();`
`864`	`864`	`QColor bc = mBrush.color();`
`865`		`- if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR ) )`
	`865`	`+ if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR ) )`
`866`	`866`	`{`
`867`	`867`	`context->setOriginalValueVariable( QgsSymbolLayerV2Utils::encodeColor( bc ) );`
`868`	`868`	`QString colorString = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR, *context, QVariant(), &ok ).toString();`
`869`	`869`	`if ( ok )`
`870`	`870`	`bc = QgsSymbolLayerV2Utils::decodeColor( colorString );`
`871`	`871`	`}`
`872`		`- if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER ) )`
	`872`	`+ if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER ) )`
`873`	`873`	`{`
`874`	`874`	`context->setOriginalValueVariable( QgsSymbolLayerV2Utils::encodeColor( pc ) );`
`875`	`875`	`QString colorString = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_COLOR_BORDER, *context, QVariant(), &ok ).toString();`
`@@ -895,7 +895,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`QString name( mName );`
`898`		`- if ( hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME ) )`
	`898`	`+ if ( context && hasDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME ) )`
`899`	`899`	`{`
`900`	`900`	`context->setOriginalValueVariable( mName );`
`901`	`901`	`name = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_NAME, *context, QVariant(), &ok ).toString();`