[composer] Fix crash caused by map items with zero height/width

nyalldawson · nyalldawson · commit 5186a6835041 · 2014-05-25T07:40:53.000+10:00
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -171,6 +171,11 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
   {
     return;
   }
+  if ( size.width() == 0 || size.height() == 0 )
+  {
+    //don't attempt to draw if size is invalid
+    return;
+  }
 
   const QgsMapSettings& ms = mComposition->mapSettings();
 

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,11 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const`
`171`	`171`	`{`
`172`	`172`	`return;`
`173`	`173`	`}`
	`174`	`+ if ( size.width() == 0 \|\| size.height() == 0 )`
	`175`	`+ {`
	`176`	`+ //don't attempt to draw if size is invalid`
	`177`	`+ return;`
	`178`	`+ }`
`174`	`179`
`175`	`180`	`const QgsMapSettings& ms = mComposition->mapSettings();`
`176`	`181`