Skip to content

Remove redundant check (addition to #5364)#5366

Merged
wiredfool merged 1 commit intopython-pillow:masterfrom
kkopachev:kk-remove-extra-check
Mar 31, 2021
Merged

Remove redundant check (addition to #5364)#5366
wiredfool merged 1 commit intopython-pillow:masterfrom
kkopachev:kk-remove-extra-check

Conversation

@kkopachev
Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor Author

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

@wiredfool
Copy link
Copy Markdown
Member

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
@kkopachev kkopachev deleted the kk-remove-extra-check branch March 31, 2021 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants