Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant check (addition to #5364) #5366

Merged
merged 1 commit into from Mar 31, 2021

Conversation

@kkopachev
Copy link
Contributor

@kkopachev kkopachev commented Mar 29, 2021

It's duplicated inside following call of TIFFReadTile

Since adding tiff reading using libtiff's TIFFReadRGBA* functions got extracted into it's own code path, there is no need to double check tiles. For more context #5364 (comment)
Original commit to fix the CVE added a test image as well: cbdce6c

It's duplicated inside following call of TIFFReadTile
@kkopachev
Copy link
Contributor Author

@kkopachev kkopachev commented Mar 31, 2021

@wiredfool would you mind incorporating this too for the release?

@wiredfool
Copy link
Member

@wiredfool wiredfool commented Mar 31, 2021

Ok, I see where this came in in the manual merge I did.

@wiredfool wiredfool merged commit 4044ecc into python-pillow:master Mar 31, 2021
50 of 53 checks passed
@kkopachev kkopachev deleted the kk-remove-extra-check branch Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants