summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-30 12:30:08 +0200
committerPetr Mladek <pmladek@suse.cz>2013-05-31 13:44:49 +0200
commite26e0e85e8d295832300ec4e6ffd2fa9b4ffeb5f (patch)
tree58dc3b360f2a6fcd5a84021e891254dc7f62e6f8
parentbc4fc5eba8f062fdcd553d7e827623f2f052a577 (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) Reviewed-on: https://gerrit.libreoffice.org/4094 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 );
}