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

PhotoRec: stricter check for .woff

Browse source
This commit is contained in:
Christophe Grenier 2014-07-26 22:52:54 +02:00
parent 4f502c9a6d
commit 497b80da24
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/file_woff.c
View file

@ -63,18 +63,23 @@ struct WOFFHeader
static int header_check_woff(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) static int header_check_woff(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
{ {
const struct WOFFHeader *woff=(const struct WOFFHeader *)buffer; const struct WOFFHeader *woff=(const struct WOFFHeader *)buffer;
if(woff->reserved==0 && if(be32(woff->length) < sizeof(struct WOFFHeader))
be32(woff->metaOffset) + be32(woff->metaLength)< be32(woff->length) && return 0;
be32(woff->privOffset) + be32(woff->privLength)< be32(woff->length)) if(be32(woff->metaOffset) > 0 && be32(woff->metaOffset) < sizeof(struct WOFFHeader))
{ return 0;
reset_file_recovery(file_recovery_new); if(be32(woff->privOffset) > 0 && be32(woff->privOffset) < sizeof(struct WOFFHeader))
file_recovery_new->extension=file_hint_woff.extension; return 0;
file_recovery_new->calculated_file_size=(uint64_t)be32(woff->length); if(be32(woff->metaOffset) + be32(woff->metaLength)> be32(woff->length) ||
file_recovery_new->data_check=&data_check_size; be32(woff->privOffset) + be32(woff->privLength)> be32(woff->length))
file_recovery_new->file_check=&file_check_size; return 0;
return 1; if(woff->reserved!=0)
} return 0;
return 0; reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_woff.extension;
file_recovery_new->calculated_file_size=(uint64_t)be32(woff->length);
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
return 1;
} }
static void register_header_check_woff(file_stat_t *file_stat) static void register_header_check_woff(file_stat_t *file_stat)