Fix crash with 2-band rasters

wonder-sk · wonder-sk · commit a9c017de903a · 2018-07-10T14:37:03.000+02:00
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -228,7 +228,7 @@ QgsRasterBlock *QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle  cons
   QRgb *outputBlockColorData = outputBlock->colorData();
 
   // faster data access to data for the common case that input data are coming from RGB image with 8-bit bands
-  bool hasByteRgb = ( redBlock->dataType() == Qgis::Byte && greenBlock->dataType() == Qgis::Byte && blueBlock->dataType() == Qgis::Byte );
+  bool hasByteRgb = ( redBlock && greenBlock && blueBlock && redBlock->dataType() == Qgis::Byte && greenBlock->dataType() == Qgis::Byte && blueBlock->dataType() == Qgis::Byte );
   const quint8 *redData = nullptr, *greenData = nullptr, *blueData = nullptr;
   if ( hasByteRgb )
   {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ QgsRasterBlock *QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle cons`
`228`	`228`	`QRgb *outputBlockColorData = outputBlock->colorData();`
`229`	`229`
`230`	`230`	`// faster data access to data for the common case that input data are coming from RGB image with 8-bit bands`
`231`		`- bool hasByteRgb = ( redBlock->dataType() == Qgis::Byte && greenBlock->dataType() == Qgis::Byte && blueBlock->dataType() == Qgis::Byte );`
	`231`	`+ bool hasByteRgb = ( redBlock && greenBlock && blueBlock && redBlock->dataType() == Qgis::Byte && greenBlock->dataType() == Qgis::Byte && blueBlock->dataType() == Qgis::Byte );`
`232`	`232`	`const quint8 redData = nullptr, greenData = nullptr, *blueData = nullptr;`
`233`	`233`	`if ( hasByteRgb )`
`234`	`234`	`{`