Protect point and line pattern symbol layer from eating too much memory

mhugent · mhugent · commit b54c75cef75f · 2013-02-21T11:20:56.000+01:00
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -747,6 +747,13 @@ void QgsLinePatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& conte
   int dx = 0;
   int dy = 0;
 
+  if ( width > 10000 || height > 10000 ) //protect symbol layer from eating too much memory
+  {
+    QImage img;
+    mBrush.setTextureImage( img );
+    return;
+  }
+
   QImage patternImage( width, height, QImage::Format_ARGB32 );
   patternImage.fill( 0 );
   QPainter p( &patternImage );
@@ -1049,6 +1056,13 @@ void QgsPointPatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& cont
   double width = context.outputPixelSize( mDistanceX ) * 2.0;
   double height = context.outputPixelSize( mDistanceY ) * 2.0;
 
+  if ( width > 10000 || height > 10000 ) //protect symbol layer from eating too much memory
+  {
+    QImage img;
+    mBrush.setTextureImage( img );
+    return;
+  }
+
   QImage patternImage( width, height, QImage::Format_ARGB32 );
   patternImage.fill( 0 );
 
