imgcodecs(png): resolve ASAN issue with vars scope and setjmp() call

This commit is contained in:
Alexander Alekhin 2017-12-27 18:24:43 +00:00
parent 2e33844f0d
commit 4f6c493b87

View File

@ -228,12 +228,12 @@ bool PngDecoder::readData( Mat& img )
uchar** buffer = _buffer;
int color = img.channels() > 1;
png_structp png_ptr = (png_structp)m_png_ptr;
png_infop info_ptr = (png_infop)m_info_ptr;
png_infop end_info = (png_infop)m_end_info;
if( m_png_ptr && m_info_ptr && m_end_info && m_width && m_height )
{
png_structp png_ptr = (png_structp)m_png_ptr;
png_infop info_ptr = (png_infop)m_info_ptr;
png_infop end_info = (png_infop)m_end_info;
if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
{
int y;