mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#49819, fdo#54609: Do not consider timestamp differences as corruption

Browse Source 
MSO 2010 can produce a files with different timestamps in the
central directory entry and local file header

Change-Id: Ic6fc0b2fad96eb30babdd7e6ef4a0175936da4c5
This commit is contained in:
Fridrich Štrba
2012-09-24 09:27:15 +02:00
parent c6107b7d49
commit 5db7ac2392
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/source/zipapi/ZipFile.cxx
View File

@@ -693,9 +693,11 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
// Do *not* compare nMethod / nHow, older versions with // Do *not* compare nMethod / nHow, older versions with
// encrypted streams write mismatching DEFLATE/STORE pairs // encrypted streams write mismatching DEFLATE/STORE pairs
// there. // there.
// Do *not* compare timestamps, since MSO 2010 can produce documents
// with timestamp difference in the central directory entry and local
// file header.
bBroken = rEntry.nVersion != nVersion bBroken = rEntry.nVersion != nVersion
|| (rEntry.nFlag & ~6L) != (nFlag & ~6L) || (rEntry.nFlag & ~6L) != (nFlag & ~6L)
|| rEntry.nTime != nTime
|| rEntry.nPathLen != nPathLen || rEntry.nPathLen != nPathLen
|| !rEntry.sPath.equals( sLOCPath ); || !rEntry.sPath.equals( sLOCPath );
} }