[ooo-build-commit] Branch 'ooo/OOO320' - package/source

[Jan Holesovsky]

 package/source/zipapi/ZipFile.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2ebb341273cf5c82cdd76660eb6969907d2d24b
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jan 4 12:28:58 2010 +0000

    CWS-TOOLING: integrate CWS fwk133
    2009-12-16 15:02:04 +0100 mav  r277824 : #i107688# handle the broken documents correctly

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index ea01a23..900c1ef 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -880,8 +880,8 @@ sal_Int32 ZipFile::recover()
                             if ( aEntry.nExtraLen < 0 ) aEntry.nExtraLen = 0x7FFF;
                             // End of quick fix
 
-
-                            sal_Int32 nBlockLength = aEntry.nSize + aEntry.nPathLen + aEntry.nExtraLen + 30 + nDescrLength;
+                            sal_Int32 nDataSize = ( aEntry.nMethod == DEFLATED ) ? aEntry.nCompressedSize : aEntry.nSize;
+                            sal_Int32 nBlockLength = nDataSize + aEntry.nPathLen + aEntry.nExtraLen + 30 + nDescrLength;
                             if ( aEntry.nPathLen <= ZIP_MAXNAMELEN && aEntry.nExtraLen < ZIP_MAXEXTRA 
                                 && ( nGenPos + nPos + nBlockLength ) <= nLength )
                             {