summaryrefslogtreecommitdiffstats
path: root/src/file_zip.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2015-09-25 20:41:16 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2015-09-25 20:41:16 +0200
commit8c6524a0434cadc2e8b22556b5f944279d40de97 (patch)
treed8afffb94c2df4ac719b1d055998b2aad035c86b /src/file_zip.c
parentb9184f1ed1d727e64d7b3de19131856a78cb38f8 (diff)
Fix regression introduced in commit 393b63c9984696229083e2fd1e97aeb57106eb60
Diffstat (limited to 'src/file_zip.c')
-rw-r--r--src/file_zip.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/file_zip.c b/src/file_zip.c
index c250c6f..39d1d3d 100644
--- a/src/file_zip.c
+++ b/src/file_zip.c
@@ -201,13 +201,16 @@ static int zip_parse_file_entry(file_recovery_t *fr, const char **ext, const uns
static int msoffice=0;
static int sh3d=0;
static const char *ext_msoffice=NULL;
- if(len==19 && memcmp(filename, "[Content_Types].xml", 19)==0)
- msoffice=1;
- else if(file_nbr==0)
+ if(file_nbr==0)
{
msoffice=0;
sh3d=0;
ext_msoffice=NULL;
+ }
+ if(len==19 && memcmp(filename, "[Content_Types].xml", 19)==0)
+ msoffice=1;
+ else if(file_nbr==0)
+ {
if(len==8 && memcmp(filename, "mimetype", 8)==0 && le16(file.extra_length)==0)
{
unsigned char buffer[128];