[composer] Fix crash with expression driven picture items

nyalldawson · nyalldawson · commit eb5627c73b37 · 2014-05-16T18:26:40.000+10:00
diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp
@@ -401,7 +401,7 @@ void QgsComposerPicture::loadPicture( const QFile& file )
   {
     recalculateSize();
   }
-  else if ( !( file.fileName().isEmpty() ) || ( mUseSourceExpression && mPictureExpr->hasEvalError() ) )
+  else if ( !( file.fileName().isEmpty() ) || ( mUseSourceExpression && mPictureExpr && mPictureExpr->hasEvalError() ) )
   {
     //trying to load an invalid file or bad expression, show cross picture
     mMode = SVG;

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ void QgsComposerPicture::loadPicture( const QFile& file )`
`401`	`401`	`{`
`402`	`402`	`recalculateSize();`
`403`	`403`	`}`
`404`		`- else if ( !( file.fileName().isEmpty() ) \|\| ( mUseSourceExpression && mPictureExpr->hasEvalError() ) )`
	`404`	`+ else if ( !( file.fileName().isEmpty() ) \|\| ( mUseSourceExpression && mPictureExpr && mPictureExpr->hasEvalError() ) )`
`405`	`405`	`{`
`406`	`406`	`//trying to load an invalid file or bad expression, show cross picture`
`407`	`407`	`mMode = SVG;`