summaryrefslogtreecommitdiff
path: root/package/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2011-01-06 14:58:44 +0100
committerKurt Zenker <kz@openoffice.org>2011-01-06 14:58:44 +0100
commitdbc6f094895662a648c2b7e55a62d53fbda279ca (patch)
tree979e3047768358b53b404c7d125292d3bdc5e69d /package/source
parentde86e3362cf4fe6f65a66b01e74f19a8d33e289b (diff)
parentf505d910216efd51409b0ea434ea16f6f2d18324 (diff)
CWS-TOOLING: integrate CWS impress208
Notes
Notes: split repo tag: components_ooo/OOO330_m19 split repo tag: components_ooo/OOO330_m20
Diffstat (limited to 'package/source')
-rw-r--r--package/source/zipapi/ZipFile.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index f01b7ce06f4b..dcd5669897e3 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -836,13 +836,18 @@ sal_Int32 ZipFile::recover()
aGrabber.seek( 0 );
- for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, 32000 ) && aBuffer.getLength() > 30; )
+ const sal_Int32 nToRead = 32000;
+ for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, nToRead ) && aBuffer.getLength() > 16; )
{
const sal_Int8 *pBuffer = aBuffer.getConstArray();
sal_Int32 nBufSize = aBuffer.getLength();
sal_Int32 nPos = 0;
- while( nPos < nBufSize - 16 )
+ // the buffer should contain at least one header,
+ // or if it is end of the file, at least the postheader with sizes and hash
+ while( nPos < nBufSize - 30
+ || ( aBuffer.getLength() < nToRead && nPos < nBufSize - 16 ) )
+
{
if ( nPos < nBufSize - 30 && pBuffer[nPos] == 'P' && pBuffer[nPos+1] == 'K' && pBuffer[nPos+2] == 3 && pBuffer[nPos+3] == 4 )
{