summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2012-03-25 21:16:39 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2012-03-25 21:16:39 +0200
commit8131f4929046b7e6fcdc7e2bf171b73c5d598aa6 (patch)
treefd4d0d31e4b8b2cae9ced1005c23d2c64ab53814
parent1965e1a6a4c543d6e736b38530348ea9c141b541 (diff)
PhotoRec: fix .rtf identification and disable data_check for .proproj text files
-rw-r--r--src/file_txt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/file_txt.c b/src/file_txt.c
index 6182335..aad0d5e 100644
--- a/src/file_txt.c
+++ b/src/file_txt.c
@@ -565,8 +565,8 @@ static int header_check_fasttxt(const unsigned char *buffer, const unsigned int
}
if(memcmp(buffer,header_rtf,sizeof(header_rtf))==0 &&
! (file_recovery!=NULL && file_recovery->file_stat!=NULL &&
- file_recovery->file_stat->file_hint==&file_hint_doc) &&
- strstr(file_recovery->filename,".snt")!=NULL)
+ file_recovery->file_stat->file_hint==&file_hint_doc &&
+ strstr(file_recovery->filename,".snt")!=NULL))
{
reset_file_recovery(file_recovery_new);
file_recovery_new->data_check=&data_check_txt;
@@ -781,6 +781,7 @@ static int header_check_fasttxt(const unsigned char *buffer, const unsigned int
}
else if(td_memmem(buffer, buffer_size, "<PremiereData Version=", 22)!=NULL)
{
+ file_recovery_new->data_check=NULL;
file_recovery_new->extension="prproj";
}
else