luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PhotoRec: Add boundary checking when parsing EXIF data

Browse source
This commit is contained in:
Christophe Grenier 2009-04-27 08:54:34 +02:00
parent 5c5a566c2a
commit ac48568197
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/file_jpg.c
View file

@ -100,14 +100,10 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
if(buffer[i]!=0xff)
return 0;
/* 0xe0 APP0 */
/* 0xef APP15 */
/* 0xfe COM */
/* 0xdb DQT */
if(buffer[i+1]==0xe0 ||
buffer[i+1]==0xfe ||
buffer[i+1]==0xdb)
{
}
else if(buffer[i+1]==0xe1)
if(buffer[i+1]==0xe1)
{ /* APP1 Exif information */
if(i+0x0A < buffer_size && 2+(buffer[i+2]<<8)+buffer[i+3] > 0x0A)
{
@ -117,12 +113,17 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
file_recovery_new->time=get_date_from_tiff_header((const TIFFHeader*)&buffer[i+0x0A], tiff_size);
}
}
else if((buffer[i+1]>=0xe0 && buffer[i+1]<=0xef) ||
buffer[i+1]==0xfe ||
buffer[i+1]==0xdb)
{
}
else
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_jpg.extension;
file_recovery_new->file_check=&file_check_jpg;
file_recovery_new->min_filesize=288;
file_recovery_new->min_filesize=(i>288?i:288);
file_recovery_new->data_check=&data_check_jpg;
file_recovery_new->calculated_file_size=2;
return 1;
@ -511,7 +512,7 @@ static void jpg_check_structure(file_recovery_t *file_recovery, const unsigned i
const unsigned int thumb_offset=thumb_data-(const char*)buffer;
const unsigned int thumb_size=ifbytecount-(const char*)tiff;
unsigned int j_old;
if(thumb_offset+thumb_size < sizeof(buffer))
if(thumb_offset < sizeof(buffer) && thumb_offset+thumb_size < sizeof(buffer))
{
unsigned int j=thumb_offset+2;
unsigned int thumb_sos_found=0;

29
src/file_tiff.c
View file

@ -65,6 +65,10 @@ static const char *find_tag_from_tiff_header_be(const TIFFHeader *tiff, const un
const uint32_t *tiff_next_diroff;
const TIFFDirEntry *ifd;
unsigned int j;
/* Bound checking */
if((const char*)ifd0 < (const char*)tiff ||
(const char*)(ifd0+1) > (const char*)tiff + tiff_size)
return NULL;
for(j=0, ifd=&ifd0->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<be16(ifd0->nbr_fields);
j++, ifd++)
@ -75,7 +79,9 @@ static const char *find_tag_from_tiff_header_be(const TIFFHeader *tiff, const un
exififd=(const struct ifd_header *)((const char*)tiff + be32(ifd->tdir_offset));
}
tiff_next_diroff=(const uint32_t *)ifd;
if(exififd!=NULL)
if(exififd!=NULL &&
(const char*)exififd > (const char*)tiff &&
(const char*)(exififd+1) <= (const char*)tiff + tiff_size)
{ /* Exif */
for(j=0, ifd=&exififd->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<be16(exififd->nbr_fields);
@ -89,6 +95,9 @@ static const char *find_tag_from_tiff_header_be(const TIFFHeader *tiff, const un
if(be32(*tiff_next_diroff)>0)
{
const const struct ifd_header *ifd1=(const struct ifd_header*)((const char *)tiff+be32(*tiff_next_diroff));
if((const char*)ifd1 <= (const char*)tiff ||
(const char*)(ifd1+1) > (const char*)tiff+tiff_size)
return NULL;
for(j=0, ifd=&ifd1->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<be16(ifd1->nbr_fields);
j++, ifd++)
@ -107,6 +116,10 @@ static const char *find_tag_from_tiff_header_le(const TIFFHeader *tiff, const un
const uint32_t *tiff_next_diroff;
const TIFFDirEntry *ifd;
unsigned int j;
/* Bound checking */
if((const char*)ifd0 < (const char*)tiff ||
(const char*)(ifd0+1) > (const char*)tiff + tiff_size)
return NULL;
for(j=0, ifd=&ifd0->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<le16(ifd0->nbr_fields);
j++, ifd++)
@ -117,7 +130,9 @@ static const char *find_tag_from_tiff_header_le(const TIFFHeader *tiff, const un
exififd=(const struct ifd_header *)((const char*)tiff + le32(ifd->tdir_offset));
}
tiff_next_diroff=(const uint32_t *)ifd;
if(exififd!=NULL)
if(exififd!=NULL &&
(const char*)exififd > (const char*)tiff &&
(const char*)(exififd+1) <= (const char*)tiff + tiff_size)
{ /* Exif */
for(j=0, ifd=&exififd->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<le16(exififd->nbr_fields);
@ -131,6 +146,10 @@ static const char *find_tag_from_tiff_header_le(const TIFFHeader *tiff, const un
if(le32(*tiff_next_diroff)>0)
{
const const struct ifd_header *ifd1=(const struct ifd_header*)((const char *)tiff+le32(*tiff_next_diroff));
/* Bound checking */
if((const char*)(ifd1) <= (const char*)tiff ||
(const char*)(ifd1+1) > (const char*)tiff+tiff_size)
return NULL;
for(j=0, ifd=&ifd1->ifd;
(const char*)(ifd+1) <= (const char*)tiff+tiff_size && j<le16(ifd1->nbr_fields);
j++, ifd++)
@ -168,11 +187,11 @@ time_t get_date_from_tiff_header(const TIFFHeader *tiff, const unsigned int tiff
/* DateTimeOriginal */
date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x9003);
/* DateTimeDigitalized*/
if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size)
if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size)
date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x9004);
if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size)
if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size)
date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x132);
if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size)
if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size)
return (time_t)0;
memset(&tm_time, 0, sizeof(tm_time));
tm_time.tm_sec=(date_asc[17]-'0')*10+(date_asc[18]-'0'); /* seconds 0-59 */