NRK
/
legacy-imlib2
forked from old/legacy-imlib2
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TIFF loader: Slightly more strict signature check 

Avoid starting libtiff on various raw image types.
This commit is contained in:
Kim Woelders 2023-07-02 07:07:21 +02:00
parent 59ab21a580
commit 70bd7e3488
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/loaders/loader_tiff.c
View File

@ -332,12 +332,25 @@ put_separate_and_raster(TIFFRGBAImage * img, uint32_t * rast,
raster((TIFFRGBAImage_Extra *) img, rast, x, y, w, h);
}
static int
_sig_check(const uint8_t * data, unsigned int size)
{
if (size < 8)
return 1;
if (data[0] == 'I' && data[1] == 'I')
return !(data[2] == 42 && data[3] == 0);
if (data[0] == 'M' && data[1] == 'M')
return !(data[2] == 0 && data[3] == 42);
return 1;
}
static int
_load(ImlibImage * im, int load_data)
{
int rc;
TIFF *tif = NULL;
uint16_t magic_number;
TIFFRGBAImage_Extra rgba_image;
uint32_t *rast = NULL;
char txt[1024];
@ -345,16 +358,9 @@ _load(ImlibImage * im, int load_data)
rc = LOAD_FAIL;
rgba_image.image = NULL;
/* Do initial signature check */
#define TIFF_BYTES_TO_CHECK sizeof(magic_number)
if (im->fi->fsize < (int)TIFF_BYTES_TO_CHECK)
return rc;
magic_number = *(const uint16_t *)im->fi->fdata;
if (magic_number != TIFF_BIGENDIAN && magic_number != TIFF_LITTLEENDIAN)
return rc;
/* Signature check */
if (_sig_check(im->fi->fdata, im->fi->fsize))
goto quit;
mm_init(im->fi->fdata, im->fi->fsize);