Merge pull request opencv#9903 from blendin:oob_write_1

alalek · alalek · commit cca99bf82493 · 2017-10-22T07:27:15.000Z
diff --git a/modules/imgcodecs/src/grfmt_bmp.cpp b/modules/imgcodecs/src/grfmt_bmp.cpp
@@ -118,7 +118,7 @@ bool  BmpDecoder::readHeader()
 
                 if( m_bpp <= 8 )
                 {
-                    CV_Assert(clrused <= 256);
+                    CV_Assert(clrused >= 0 && clrused <= 256);
                     memset(m_palette, 0, sizeof(m_palette));
                     m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
                     iscolor = IsColorPalette( m_palette, m_bpp );

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ bool BmpDecoder::readHeader()`
`118`	`118`
`119`	`119`	`if( m_bpp <= 8 )`
`120`	`120`	`{`
`121`		`- CV_Assert(clrused <= 256);`
	`121`	`+ CV_Assert(clrused >= 0 && clrused <= 256);`
`122`	`122`	`memset(m_palette, 0, sizeof(m_palette));`
`123`	`123`	`m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );`
`124`	`124`	`iscolor = IsColorPalette( m_palette, m_bpp );`