Skip to content

O
opencv
Commit e15a56d1 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #9915 from alalek:backport_9903 

(2.4) Backport #9903: Fix out of bounds write
parents d0f34684 c46521ad
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/highgui/src/grfmt_bmp.cpp
View file @ e15a56d1
...@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader() ...@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader()
if( m_bpp <= 8 ) if( m_bpp <= 8 )
{ {
CV_Assert(clrused <= 256); CV_Assert(clrused >= 0 && clrused <= 256);
memset(m_palette, 0, sizeof(m_palette)); memset(m_palette, 0, sizeof(m_palette));
m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 ); m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
iscolor = IsColorPalette( m_palette, m_bpp ); iscolor = IsColorPalette( m_palette, m_bpp );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment