diff options
author | Christophe Grenier <grenier@cgsecurity.org> | 2014-07-26 23:03:19 +0200 |
---|---|---|
committer | Christophe Grenier <grenier@cgsecurity.org> | 2014-07-26 23:03:19 +0200 |
commit | 90953b97653cefe8c710c4ca186dfc73ca608e5b (patch) | |
tree | 81c5fdd91842b5ce17e6929d148871a6dcaeb132 /src/file_xpt.c | |
parent | e7562ef7c12462e97b3afcc756e5e1a6385964bb (diff) |
PhotoRec: stricter check for .xpt
Diffstat (limited to 'src/file_xpt.c')
-rw-r--r-- | src/file_xpt.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/src/file_xpt.c b/src/file_xpt.c index cad2881..57087d1 100644 --- a/src/file_xpt.c +++ b/src/file_xpt.c @@ -32,7 +32,6 @@ #include "common.h" 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= { .extension="xpt", @@ -44,15 +43,6 @@ const file_hint_t file_hint_xpt= { .register_header_check=®ister_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 * for more information about this file format */ @@ -66,16 +56,23 @@ 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) { - if(memcmp(buffer, xpt_header, sizeof(xpt_header))==0) - { - const struct TypeLibHeader *xpt=(const struct TypeLibHeader*)buffer; - reset_file_recovery(file_recovery_new); - file_recovery_new->extension=file_hint_xpt.extension; - file_recovery_new->min_filesize=65; - file_recovery_new->calculated_file_size=be32(xpt->file_length); - file_recovery_new->data_check=&data_check_size; - file_recovery_new->file_check=&file_check_size; - return 1; - } - return 0; + const struct TypeLibHeader *xpt=(const struct TypeLibHeader*)buffer; + if(be32(xpt->file_length) < 65) + return 0; + reset_file_recovery(file_recovery_new); + file_recovery_new->extension=file_hint_xpt.extension; + file_recovery_new->min_filesize=65; + file_recovery_new->calculated_file_size=be32(xpt->file_length); + file_recovery_new->data_check=&data_check_size; + file_recovery_new->file_check=&file_check_size; + return 1; +} + +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); } |