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

PhotoRec: stricter check for .dad

Browse source
This commit is contained in:
Christophe Grenier 2014-08-09 09:41:50 +02:00
parent 3bca461346
commit 32e432da48
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/file_dad.c
View file

@ -73,14 +73,18 @@ static data_check_t data_check_dad(const unsigned char *buffer, const unsigned i
static int header_check_dad(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_dad(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 dad_header *dad=(const struct dad_header *)buffer;
if(file_recovery!=NULL && if(file_recovery!=NULL &&
file_recovery->file_stat!=NULL && file_recovery->file_stat!=NULL &&
file_recovery->file_stat->file_hint==&file_hint_dad && file_recovery->file_stat->file_hint==&file_hint_dad &&
(file_recovery->calculated_file_size==file_recovery->file_size || (file_recovery->calculated_file_size==file_recovery->file_size ||
file_recovery->blocksize < 16)) file_recovery->blocksize < 16))
return 0; return 0;
if(le32(dad->size)<16)
return 0;
reset_file_recovery(file_recovery_new); reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_dad.extension; file_recovery_new->extension=file_hint_dad.extension;
file_recovery_new->min_filesize=le32(dad->size);
if(file_recovery_new->blocksize >= 16) if(file_recovery_new->blocksize >= 16)
{ {
file_recovery_new->data_check=&data_check_dad; file_recovery_new->data_check=&data_check_dad;