Fixed fread size check for corrupted PNGs#26734
Merged
asmorkalov merged 1 commit intoopencv:4.xfrom Jan 8, 2025
Merged
Conversation
Contributor
|
LGTM. That does not fix the asan issue though. |
Contributor
|
Or maybe: if (fread(sig, 8, 1, m_f) != 1)
return false;
id = read_chunk(m_chunkIHDR);To have code similar to what's below. |
Contributor
|
Actually, shoulnd't that be out of the if( !m_buf.empty() )
png_set_read_fn(png_ptr, this, (png_rw_ptr)readDataFromBuf );
else
{
m_f = fopen(m_filename.c_str(), "rb");
if (!m_f)
{
return false;
}
png_init_io(png_ptr, m_f);
}
if (read_from_io(&sig, 8, 1) != 1)
return false;
id = read_chunk(m_chunkIHDR);
if (!(id == id_IHDR && m_chunkIHDR.p.size() == 25))
{
return false;
} |
Contributor
Author
|
yes, makes sense. |
Contributor
|
While at it read_from_io always takes 1 as a last argument, let's remove it (and replace it by 1 internally) and have it return a bool instead. |
Contributor
Author
|
Let's do it after release. There are more cases for cleanup, but they are less important for now. |
db6a1ef to
198f238
Compare
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.