summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2011-12-19 11:45:26 +0100
committerPetr Mladek <pmladek@suse.cz>2011-12-23 11:05:43 +0100
commitaf45ce4dc9a4b7aea9214b5d74bf60809a4da78d (patch)
tree03682c33de2b7dad3a8b6239e2d44f95d8fabf73
parentbb825077ee5bb33db9c518ef9455612aa413a0b8 (diff)
Revert "Fix n#653688"
This reverts commit 4481a2fd1a40b27c1f8e784517b79fcc3c3ca196. Broke password-protected odf document reading. Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--package/source/zipapi/ZipFile.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 03a0108e0..fb56c2815 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -802,7 +802,7 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
// the method can be reset for internal use so it is not checked
bBroken = rEntry.nVersion != nVersion
- || rEntry.nMethod != nHow
+ || rEntry.nFlag != nFlag
|| rEntry.nTime != nTime
|| rEntry.nPathLen != nPathLen
|| !rEntry.sPath.equals( sLOCPath );
@@ -812,12 +812,6 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
bBroken = sal_True;
}
- // ignore bits 1 & 2 for normal deflate algo - they're purely informative
- if( nHow != 8 && nHow != 9 )
- bBroken = bBroken || rEntry.nFlag != nFlag;
- else if( (rEntry.nFlag & ~6L) != (nFlag & ~6L) )
- bBroken = true;
-
if ( bBroken && !bRecoveryMode )
throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ),
Reference< XInterface >() );