mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-30 17:37:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed fread size check for corrupted PNGs.

Browse Source
This commit is contained in:
Alexander Smorkalov 2025-01-08 13:28:28 +03:00
parent 66ffeae4b1
commit 198f23890e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgcodecs/src/grfmt_png.cpp
View File

@ -253,18 +253,12 @@ bool PngDecoder::readHeader()
return false; return false;
} }
png_init_io(png_ptr, m_f); png_init_io(png_ptr, m_f);
if (fread(sig, 1, 8, m_f))
id = read_chunk(m_chunkIHDR);
} }
if (id != id_IHDR)
{
if (read_from_io(&sig, 8, 1) != 1) if (read_from_io(&sig, 8, 1) != 1)
return false; return false;
id = read_chunk(m_chunkIHDR);
}
id = read_chunk(m_chunkIHDR);
if (!(id == id_IHDR && m_chunkIHDR.p.size() == 25)) if (!(id == id_IHDR && m_chunkIHDR.p.size() == 25))
{ {
return false; return false;