Skip to content

Close file pointer copy in the libtiff encoder if still open #6986

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.

Sign up for GitHub

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

Merged
radarhere merged 3 commits into from
Mar 5, 2023
Merged

Close file pointer copy in the libtiff encoder if still open #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2299490
Close the file pointer copy (_fp) in the libtiff encoder if it is sti…
Mar 3, 2023
e953978
Added test
radarhere Mar 4, 2023
bf27074
Merge pull request #1 from radarhere/fix_libtiff_file_pointer
fcarron Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Tests/test_file_libtiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,3 +1065,9 @@ def test_save_zero(self, compression, tmp_path):
out = str(tmp_path / "temp.tif")
with pytest.raises(SystemError):
im.save(out, compression=compression)

def test_save_many_compressed(self, tmp_path):
im = hopper()
out = str(tmp_path / "temp.tif")
for _ in range(10000):
im.save(out, compression="jpeg")
5 changes: 5 additions & 0 deletions src/PIL/TiffImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,11 @@ def _save(im, fp, filename):
fp.write(data)
if errcode:
break
if _fp:
try:
os.close(_fp)
except OSError:
pass
if errcode < 0:
msg = f"encoder error {errcode} when writing image file"
raise OSError(msg)
Expand Down