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

Fixed reading FLI/FLC images with a prefix chunk #7804

Merged
merged 1 commit into from Feb 22, 2024

Conversation

twolife
Copy link
Contributor

@twolife twolife commented Feb 16, 2024

fix FLC decoder for files with prefix chunk

without the seek() the decoder continues to read bytes in the prefixchunk and have zero chance to find the 0xF1FA magic number ut needs just after

@hugovk
Copy link
Member

hugovk commented Feb 16, 2024

Please could you add a test that fails without the fix, and passes with it?

@twolife
Copy link
Contributor Author

twolife commented Feb 16, 2024

This is reproducible with this sample : https://samples.ffmpeg.org/fli-flc/2422.FLC

from PIL import Image, ImageFile
ImageFile.LOAD_TRUNCATED_IMAGES = True
im = Image.open("2422.FLC")
im.seek(15)
im.save('frame15.png')

You get garbage without the patch and a clean image with the patch

@hugovk
Copy link
Member

hugovk commented Feb 16, 2024

Can you write a unit test, with an image that can be contributed under Pillow's licence?

A unit test helps ensure this doesn't break in the future.

@radarhere radarhere changed the title fix FLI/FLC decoder for files with a prefix chunk Fix FLI/FLC decoder for files with a prefix chunk Feb 16, 2024
@twolife
Copy link
Contributor Author

twolife commented Feb 17, 2024

test added

Tests/test_file_fli.py Outdated Show resolved Hide resolved
Tests/test_file_fli.py Outdated Show resolved Hide resolved
Tests/test_file_fli.py Outdated Show resolved Hide resolved
Tests/test_file_fli.py Outdated Show resolved Hide resolved
Tests/test_file_fli.py Outdated Show resolved Hide resolved
Tests/test_file_fli.py Outdated Show resolved Hide resolved
@hugovk hugovk merged commit e08e1f8 into python-pillow:main Feb 22, 2024
56 of 57 checks passed
@hugovk
Copy link
Member

hugovk commented Feb 22, 2024

Thank you!

@radarhere radarhere changed the title Fix FLI/FLC decoder for files with a prefix chunk Fixed reading FLI/FLC images with a prefix chunk Feb 22, 2024
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.

None yet

3 participants