[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-4' - package/source

[Fridrich Å trba]

 package/source/zipapi/ZipFile.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit b453554ce529a99e47e10fb8d631d19a56e4a458
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu May 30 12:30:08 2013 +0200

    Accept even more corrupted zip documents as long as we can read them
    
    Change-Id: I8d039664d6c33d978b9addc3f35cbeae86d6c710
    (cherry picked from commit 1b049bd2dae52dc154ea6bee075a254a9b6cc318)
    (cherry picked from commit d360333f83e3115219c3928525060c6c2a8711db)
    (cherry picked from commit 0ed9f3a30ae2069d88d6a45d4f73817aa8596fbf)
    Reviewed-on: https://gerrit.libreoffice.org/4104
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 0da4c33..23d33c0 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -694,7 +694,6 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
         // with timestamp difference in the central directory entry and local
         // file header.
         bBroken = rEntry.nVersion != nVersion
-                        || (rEntry.nFlag & ~6L) != (nFlag & ~6L)
                         || rEntry.nPathLen != nPathLen
                         || !rEntry.sPath.equals( sLOCPath );
     }