From: Christos Zoulas Date: Mon, 8 Oct 2018 18:25:25 +0000 (+0000) Subject: PR/46: vitalyisaev2: Search deeper in the zip file for additional headers. X-Git-Tag: FILE5_35~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ff074fc5336474eea03b3776126423acdf6ef23;p=file PR/46: vitalyisaev2: Search deeper in the zip file for additional headers. --- diff --git a/magic/Magdir/msooxml b/magic/Magdir/msooxml index 96eda074..b7388f2d 100644 --- a/magic/Magdir/msooxml +++ b/magic/Magdir/msooxml @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: msooxml,v 1.9 2018/08/19 09:30:50 christos Exp $ +# $File: msooxml,v 1.10 2018/10/08 18:25:25 christos Exp $ # msooxml: file(1) magic for Microsoft Office XML # From: Ralf Brown @@ -29,17 +29,17 @@ # skip to the second local file header # since some documents include a 520-byte extra field following the file # header, we need to scan for the next header ->>(18.l+49) search/2000 PK\003\004 +>>(18.l+49) search/6000 PK\003\004 # now skip to the *third* local file header; again, we need to scan due to a # 520-byte extra field following the file header ->>>&26 search/1000 PK\003\004 +>>>&26 search/6000 PK\003\004 # and check the subdirectory name to determine which type of OOXML # file we have. Correct the mimetype with the registered ones: # http://technet.microsoft.com/en-us/library/cc179224.aspx >>>>&26 use msooxml >>>>&26 default x # OpenOffice/Libreoffice orders ZIP entry differently, so check the 4th file ->>>>>&26 search/1000 PK\003\004 +>>>>>&26 search/6000 PK\003\004 >>>>>>&26 use msooxml >>>>>>&26 default x Microsoft OOXML >>>>>&26 default x Microsoft OOXML