Fix crash if colour for pallette is out of range

timlinux · timlinux · commit bbf0c08e9cca · 2012-09-12T12:09:23.000+02:00
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -138,7 +138,14 @@ void * QgsPalettedRasterRenderer::readBlock( int bandNo, QgsRectangle  const & e
       }
       if ( !hasTransparency )
       {
-        imageScanLine[j] = mColors[ val ].rgba();
+        if ( val < 0 || val > mNColors )
+        {
+          imageScanLine[j] = myDefaultColor;
+        }
+        else
+        {
+          imageScanLine[j] = mColors[ val ].rgba();
+        }
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,14 @@ void * QgsPalettedRasterRenderer::readBlock( int bandNo, QgsRectangle const & e`
`138`	`138`	`}`
`139`	`139`	`if ( !hasTransparency )`
`140`	`140`	`{`
`141`		`- imageScanLine[j] = mColors[ val ].rgba();`
	`141`	`+ if ( val < 0 \|\| val > mNColors )`
	`142`	`+ {`
	`143`	`+ imageScanLine[j] = myDefaultColor;`
	`144`	`+ }`
	`145`	`+ else`
	`146`	`+ {`
	`147`	`+ imageScanLine[j] = mColors[ val ].rgba();`
	`148`	`+ }`
`142`	`149`	`}`
`143`	`150`	`else`
`144`	`151`	`{`