Revert "Accept even more corrupted zip documents as long as we can read them"

This reverts commit ef2ad0063a530aee186568579378a368180547a4.
2013-05-30 12:35:19 +02:00 · 2013-05-30 12:35:19 +02:00 · 482d1ae3d0
commit 482d1ae3d0
parent 1727b26864
2 changed files with 2 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 56fb45d986561dde4a9675a2bd7495b7feb1df32
+Subproject commit 9725a25d88fd4a4c2abfcc41a2961bdb2de4ebb1
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@ -691,6 +691,7 @@ 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 );
    }