Commits

Anonymous committed cf61bce Merge

CWS-TOOLING: integrate CWS fwk133_DEV300

  • Participants
  • Parent commits b2d458f, be43cbd

Comments (0)

Files changed (1)

File package/source/zipapi/ZipFile.cxx

 							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 )
 							{