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

PhotoRec: stricter check for .xpt

Browse source
This commit is contained in:
Christophe Grenier 2014-07-26 23:03:19 +02:00
parent e7562ef7c1
commit 90953b9765
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/file_xpt.c
View file

@ -32,7 +32,6 @@
#include "common.h" #include "common.h"
static void register_header_check_xpt(file_stat_t *file_stat); static void register_header_check_xpt(file_stat_t *file_stat);
static int header_check_xpt(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 file_hint_t file_hint_xpt= { const file_hint_t file_hint_xpt= {
.extension="xpt", .extension="xpt",
@ -44,15 +43,6 @@ const file_hint_t file_hint_xpt= {
.register_header_check=&register_header_check_xpt .register_header_check=&register_header_check_xpt
}; };
static const unsigned char xpt_header[16]={
'X', 'P', 'C', 'O', 'M', '\n', 'T', 'y',
'p', 'e', 'L', 'i', 'b', '\r', '\n', 0x1a
};
static void register_header_check_xpt(file_stat_t *file_stat)
{
register_header_check(0, xpt_header,sizeof(xpt_header), &header_check_xpt, file_stat);
}
/* Read http://www.mozilla.org/scriptable/typelib_file.html /* Read http://www.mozilla.org/scriptable/typelib_file.html
* for more information about this file format */ * for more information about this file format */
@ -66,9 +56,9 @@ struct TypeLibHeader {
static int header_check_xpt(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_xpt(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, xpt_header, sizeof(xpt_header))==0)
{
const struct TypeLibHeader *xpt=(const struct TypeLibHeader*)buffer; const struct TypeLibHeader *xpt=(const struct TypeLibHeader*)buffer;
if(be32(xpt->file_length) < 65)
return 0;
reset_file_recovery(file_recovery_new); reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_xpt.extension; file_recovery_new->extension=file_hint_xpt.extension;
file_recovery_new->min_filesize=65; file_recovery_new->min_filesize=65;
@ -76,6 +66,13 @@ static int header_check_xpt(const unsigned char *buffer, const unsigned int buff
file_recovery_new->data_check=&data_check_size; file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size; file_recovery_new->file_check=&file_check_size;
return 1; return 1;
} }
return 0;
static void register_header_check_xpt(file_stat_t *file_stat)
{
static const unsigned char xpt_header[16]={
'X', 'P', 'C', 'O', 'M', '\n', 'T', 'y',
'p', 'e', 'L', 'i', 'b', '\r', '\n', 0x1a
};
register_header_check(0, xpt_header,sizeof(xpt_header), &header_check_xpt, file_stat);
} }