summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-30 12:30:08 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-05-30 15:17:51 +0000
commitb453554ce529a99e47e10fb8d631d19a56e4a458 (patch)
tree6a6ac3957a1e43ec37831fa085db9447c227e7c7
parent574b941fce0113f6016d5152b15e83ad74a5916a (diff)
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@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
-rw-r--r--package/source/zipapi/ZipFile.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 0da4c337ef60..23d33c0cac56 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 );
}