generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug 6445

Browse Source 
Root cause: when calling imread to read the pgm file, when returning with success reading file, the destructor will free the resource which used by memcpy, but in the code, the resource calculation was not correct, therefore, it will cause memory corruption during resource free.
This commit is contained in:
Zhenqing, Hu 2016-04-21 14:39:55 +08:00
parent ec63343f34
commit 94a9e16943
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgcodecs/src/grfmt_pxm.cpp
View File

@ -190,7 +190,6 @@ bool PxMDecoder::readData( Mat& img )
{
int color = img.channels() > 1;
uchar* data = img.ptr();
int step = (int)img.step;
PaletteEntry palette[256];
bool result = false;
int bit_depth = CV_ELEM_SIZE1(m_type)*8;
@ -229,7 +228,7 @@ bool PxMDecoder::readData( Mat& img )
case 1:
if( !m_binary )
{
for( y = 0; y < m_height; y++, data += step )
for( y = 0; y < m_height; y++, data += img.step )
{
for( x = 0; x < m_width; x++ )
src[x] = ReadNumber( m_strm, 1 ) != 0;
@ -242,7 +241,7 @@ bool PxMDecoder::readData( Mat& img )
}
else
{
for( y = 0; y < m_height; y++, data += step )
for( y = 0; y < m_height; y++, data += img.step )
{
m_strm.getBytes( src, src_pitch );
@ -258,7 +257,7 @@ bool PxMDecoder::readData( Mat& img )
////////////////////////// 8 BPP /////////////////////////
case 8:
case 24:
for( y = 0; y < m_height; y++, data += step )
for( y = 0; y < m_height; y++, data += img.step )
{
if( !m_binary )
{
@ -310,7 +309,7 @@ bool PxMDecoder::readData( Mat& img )
}
}
else
memcpy( data, src, m_width*(bit_depth/8) );
memcpy( data, src, m_width);
}
else
{