package/source/zipapi/ZipFile.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 736b9ee7bdd5f9fd0a65a7ab3d9ae3c283007f09 Author: Fridrich Štrba <[email protected]> Date: Mon Sep 24 09:27:15 2012 +0200 fdo#49819, fdo#54609: Do not consider timestamp differences as corruption MSO 2010 can produce a files with different timestamps in the central directory entry and local file header Change-Id: Ic6fc0b2fad96eb30babdd7e6ef4a0175936da4c5 Signed-off-by: Michael Meeks <[email protected]> Signed-off-by: Cédric Bosdonnat <[email protected]> Signed-off-by: Andras Timar <[email protected]> diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index f154dfe..53ace46 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -699,9 +699,11 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry ) // Do *not* compare nMethod / nHow, older versions with // encrypted streams write mismatching DEFLATE/STORE pairs // 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 || (rEntry.nFlag & ~6L) != (nFlag & ~6L) - || rEntry.nTime != nTime || rEntry.nPathLen != nPathLen || !rEntry.sPath.equals( sLOCPath ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
