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

PhotoRec: stricter check for .wdp

Browse source
This commit is contained in:
Christophe Grenier 2014-07-26 22:51:32 +02:00
parent 1ef60b15f9
commit 0b47724ef5
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/file_wdp.c
View file

@ -30,6 +30,7 @@
#include "types.h" #include "types.h"
#include "filegen.h" #include "filegen.h"
#include "file_tiff.h" #include "file_tiff.h"
#include "common.h"
static void register_header_check_wdp(file_stat_t *file_stat); static void register_header_check_wdp(file_stat_t *file_stat);
static int header_check_wdp(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_wdp(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);
@ -44,24 +45,20 @@ const file_hint_t file_hint_wdp= {
.register_header_check=&register_header_check_wdp .register_header_check=&register_header_check_wdp
}; };
static const unsigned char wdp_header[4]= {'I', 'I', 0xbc, 0x01};
static void register_header_check_wdp(file_stat_t *file_stat)
{
register_header_check(0, wdp_header, sizeof(wdp_header), &header_check_wdp, file_stat);
}
static int header_check_wdp(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_wdp(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)
{ {
if(memcmp(buffer, wdp_header, sizeof(wdp_header))==0) const TIFFHeader *header=(const TIFFHeader *)buffer;
{ if(le32(header->tiff_diroff) < sizeof(TIFFHeader))
return 0;
reset_file_recovery(file_recovery_new); reset_file_recovery(file_recovery_new);
file_recovery_new->extension="wdp"; file_recovery_new->extension="wdp";
file_recovery_new->time=get_date_from_tiff_header((const TIFFHeader *)buffer, buffer_size); file_recovery_new->time=get_date_from_tiff_header((const TIFFHeader *)buffer, buffer_size);
file_recovery_new->file_check=&file_check_tiff; file_recovery_new->file_check=&file_check_tiff;
return 1; return 1;
} }
return 0;
static void register_header_check_wdp(file_stat_t *file_stat)
{
static const unsigned char wdp_header[4]= {'I', 'I', 0xbc, 0x01};
register_header_check(0, wdp_header, sizeof(wdp_header), &header_check_wdp, file_stat);
} }