[PATCH libreoffice-4-0-4] Accept even more corrupted zip documents as long as we can r...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4104

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/4104/1

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)
---
M package/source/zipapi/ZipFile.cxx
1 file changed, 0 insertions(+), 1 deletion(-)



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 @@
         // 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 );
     }

-- 
To view, visit https://gerrit.libreoffice.org/4104
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d039664d6c33d978b9addc3f35cbeae86d6c710
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-4
Gerrit-Owner: Fridrich Strba <fridrich at documentfoundation.org>