diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-01-07 20:06:19 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-01-07 20:06:19 +0100 |
| commit | f2d22b6bb9c7cbd7573f23b116c2082224b4f0fd (patch) | |
| tree | da00d151edbe0244b33ba5abf24c972ecac3643f | |
| parent | 30321960a424fb71d51172cbbc017998b92388d3 (diff) | |
| parent | 2aa1dc9a47787f2e499a22c901a52939e77a27bc (diff) | |
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 47d47a27e..c99c9653e 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -843,13 +843,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 ) { |