python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-15 06:07:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not close provided file handles with libtiff

Browse Source
This commit is contained in:
Andrew Murray 2024-10-11 19:37:56 +11:00
parent 3d9c05c224
commit 7edf952832
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PIL/TiffImagePlugin.py
View File

@ -1864,7 +1864,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if hasattr(fp, "fileno"): if hasattr(fp, "fileno"):
try: try:
fp.seek(0) fp.seek(0)
_fp = os.dup(fp.fileno()) _fp = fp.fileno()
except io.UnsupportedOperation: except io.UnsupportedOperation:
pass pass
@ -1943,11 +1943,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
fp.write(data) fp.write(data)
if errcode: if errcode:
break break
if _fp:
try:
os.close(_fp)
except OSError:
pass
if errcode < 0: if errcode < 0:
msg = f"encoder error {errcode} when writing image file" msg = f"encoder error {errcode} when writing image file"
raise OSError(msg) raise OSError(msg)

26
src/libImaging/TiffDecode.c
View File

@ -780,7 +780,7 @@ ImagingLibTiffDecode(
decode_err: decode_err:
// TIFFClose in libtiff calls tif_closeproc and TIFFCleanup // TIFFClose in libtiff calls tif_closeproc and TIFFCleanup
if (clientstate->fp) { if (clientstate->fp) {
// Pillow will manage the closing of the file rather than libtiff // Python will manage the closing of the file rather than libtiff
// So only call TIFFCleanup // So only call TIFFCleanup
TIFFCleanup(tiff); TIFFCleanup(tiff);
} else { } else {
@ -1008,7 +1008,17 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
) == -1) { ) == -1) {
TRACE(("Encode Error, row %d\n", state->y)); TRACE(("Encode Error, row %d\n", state->y));
state->errcode = IMAGING_CODEC_BROKEN; state->errcode = IMAGING_CODEC_BROKEN;
TIFFClose(tiff);
// TIFFClose in libtiff calls tif_closeproc and TIFFCleanup
if (clientstate->fp) {
// Python will manage the closing of the file rather than libtiff
// So only call TIFFCleanup
TIFFCleanup(tiff);
} else {
// When tif_closeproc refers to our custom _tiffCloseProc though,
// that is fine, as it does not close the file
TIFFClose(tiff);
}
if (!clientstate->fp) { if (!clientstate->fp) {
free(clientstate->data); free(clientstate->data);
} }
@ -1025,14 +1035,22 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
TRACE(("Error flushing the tiff")); TRACE(("Error flushing the tiff"));
// likely reason is memory. // likely reason is memory.
state->errcode = IMAGING_CODEC_MEMORY; state->errcode = IMAGING_CODEC_MEMORY;
TIFFClose(tiff); if (clientstate->fp) {
TIFFCleanup(tiff);
} else {
TIFFClose(tiff);
}
if (!clientstate->fp) { if (!clientstate->fp) {
free(clientstate->data); free(clientstate->data);
} }
return -1; return -1;
} }
TRACE(("Closing \n")); TRACE(("Closing \n"));
TIFFClose(tiff); if (clientstate->fp) {
TIFFCleanup(tiff);
} else {
TIFFClose(tiff);
}
// reset the clientstate metadata to use it to read out the buffer. // reset the clientstate metadata to use it to read out the buffer.
clientstate->loc = 0; clientstate->loc = 0;
clientstate->size = clientstate->eof; // redundant? clientstate->size = clientstate->eof; // redundant?