helpcontent2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b049bd2dae52dc154ea6bee075a254a9b6cc318 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Thu May 30 12:30:08 2013 +0200
Accept even more corrupted zip documents as long as we can read them Change-Id: I8d039664d6c33d978b9addc3f35cbeae86d6c710 diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 9a894f4..f9da68b 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -691,7 +691,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 ); } commit 482d1ae3d0fa378d11a28aa87c4d81c1ddf7b36c Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Thu May 30 12:35:19 2013 +0200 Revert "Accept even more corrupted zip documents as long as we can read them" This reverts commit ef2ad0063a530aee186568579378a368180547a4. diff --git a/helpcontent2 b/helpcontent2 index 56fb45d..9725a25 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 56fb45d986561dde4a9675a2bd7495b7feb1df32 +Subproject commit 9725a25d88fd4a4c2abfcc41a2961bdb2de4ebb1 diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index f9da68b..9a894f4 100644 --- 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 ); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits