diff options
| author | os <os@openoffice.org> | 2010-02-10 16:26:31 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2010-02-10 16:26:31 +0100 |
| commit | b612c88abef8ef4ac71a30f10f61c010f9269452 (patch) | |
| tree | a07f80466453851b26e2094a91789f0e5912bb88 /package | |
| parent | 8c72abcc29ecbfc03e2d8f908ac24f0b66cfb13d (diff) | |
| parent | 055bc5c7f48cd556d256dedc32671f60ad30ccf4 (diff) | |
update to m71
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index f6dafac4cb6a..9934caa0c066 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 ) { |