liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix size of TIFFTAG_EXIFIFD as passed to TIFFSetField

Browse Source 
Starting with libtiff 4.0.0, TIFFTAG_EXIFIFD has size of 64 bits, so it
must be set as a 64-bit value. Otherwise, since TIFFSetField is a
variadic function, there's no conversion, and the function reads garbage
into the higher dword.

This patch implements the fix and thus closes #5141.
This commit is contained in:
Ruslan Kabatsayev
2021-07-15 12:06:06 +03:00
parent d7f9e1f51c
commit 9988fa1fdc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/imageio.cc
View File

@@ -1399,18 +1399,19 @@ int ImageIO::saveTIFF (const Glib::ustring &fname, int bps, bool isFloat, bool u
if (exif) { if (exif) {
int exif_size = exif->calculateSize(); int exif_size = exif->calculateSize();
unsigned char *buffer = new unsigned char[exif_size + 8];
// TIFFOpen writes out the header and sets file pointer at position 8 // TIFFOpen writes out the header and sets file pointer at position 8
const uint64_t file_offset = 8; // must be 64-bit, because TIFFTAG_EXIFIFD is
unsigned char *buffer = new unsigned char[exif_size + file_offset];
exif->write (8, buffer); exif->write (file_offset, buffer);
write (fileno, buffer + 8, exif_size); write (fileno, buffer + file_offset, exif_size);
delete [] buffer; delete [] buffer;
// let libtiff know that scanlines or any other following stuff should go // let libtiff know that scanlines or any other following stuff should go
// at a different offset: // at a different offset:
TIFFSetWriteOffset (out, exif_size + 8); TIFFSetWriteOffset (out, exif_size + file_offset);
TIFFSetField (out, TIFFTAG_EXIFIFD, 8); TIFFSetField (out, TIFFTAG_EXIFIFD, file_offset);
applyExifPatch = true; applyExifPatch = true;
} }
} }