summaryrefslogtreecommitdiffstats
path: root/src/file_txt.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2014-03-30 20:00:05 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2014-03-30 20:00:05 +0200
commitf013c26602c15900ac88dbcb35b4fcdaa27ff419 (patch)
tree55b16f113cdbdd3687946fcdd494bf771e5939b9 /src/file_txt.c
parenta23c1b5a884bd22aa0eb9d9889c2e3980126925e (diff)
PhotoRec: do not check for foreign txt inside zip archive
Diffstat (limited to 'src/file_txt.c')
-rw-r--r--src/file_txt.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/file_txt.c b/src/file_txt.c
index 4debec8..1e2c115 100644
--- a/src/file_txt.c
+++ b/src/file_txt.c
@@ -930,7 +930,7 @@ static int header_check_txt(const unsigned char *buffer, const unsigned int buff
return 0;
}
else if(file_recovery->file_stat->file_hint == &file_hint_fasttxt ||
- file_recovery->file_stat->file_hint == &file_hint_txt)
+ file_recovery->file_stat->file_hint == &file_hint_txt)
{
if(strstr(file_recovery->filename,".html")==NULL)
return 0;
@@ -951,16 +951,6 @@ static int header_check_txt(const unsigned char *buffer, const unsigned int buff
td_memmem(buffer, buffer_size_test, "[camera info]", 13)!=NULL)
return 0;
}
- else if(file_recovery->file_stat->file_hint == &file_hint_zip)
- {
- const unsigned char zip_header[4] = { 'P', 'K', 0x03, 0x04};
- /* .sh3d may contain text */
- if(strstr(file_recovery->filename, ".sh3d")!=NULL)
- return 0;
- /* Return if still in a zip */
- if(td_memmem(buffer, buffer_size_test, zip_header, 4)!=NULL)
- return 0;
- }
else
return 0;
}