[symbology] prevent creation of a zero width/height line pattern image (fixes #15728)

nirvn · nirvn · commit 3212d393c10e · 2016-10-20T13:23:21.000+07:00
diff --git a/src/core/symbology-ng/qgsfillsymbollayer.cpp b/src/core/symbology-ng/qgsfillsymbollayer.cpp
@@ -2654,7 +2654,8 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext&
   width += 2 * xBuffer;
   height += 2 * yBuffer;
 
-  if ( width > 10000 || height > 10000 ) //protect symbol layer from eating too much memory
+  //protect from zero width/height image and symbol layer from eating too much memory
+  if ( width > 10000 || height > 10000 || width == 0 || height == 0 )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -2654,7 +2654,8 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext&`
`2654`	`2654`	`width += 2 * xBuffer;`
`2655`	`2655`	`height += 2 * yBuffer;`
`2656`	`2656`
`2657`		`- if ( width > 10000 \|\| height > 10000 ) //protect symbol layer from eating too much memory`
	`2657`	`+ //protect from zero width/height image and symbol layer from eating too much memory`
	`2658`	`+ if ( width > 10000 \|\| height > 10000 \|\| width == 0 \|\| height == 0 )`
`2658`	`2659`	`{`
`2659`	`2660`	`return;`
`2660`	`2661`	`}`