diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-31 09:55:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-18 10:09:49 +0200 |
| commit | 4729033764965c77c66b0437dfd03677f1bf187c (patch) | |
| tree | e1aafdd44f33499219d9803a5ea371a8e3665a68 /filter | |
| parent | 46c0b087c7ca1aec63fdac12f9db7fb0b734673d (diff) | |
check stream status
Change-Id: I65ed5979d35d8739367294a71620782b832cfd71
(cherry picked from commit a8fe085f973b4ccf846fe231af0fa25eda59911e)
Reviewed-on: https://gerrit.libreoffice.org/18160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/cppunit/data/pict/fail/hang-1.pct | bin | 0 -> 97206 bytes | |||
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 10 |
2 files changed, 6 insertions, 4 deletions
diff --git a/filter/qa/cppunit/data/pict/fail/hang-1.pct b/filter/qa/cppunit/data/pict/fail/hang-1.pct Binary files differnew file mode 100644 index 000000000000..735ce0aca7f3 --- /dev/null +++ b/filter/qa/cppunit/data/pict/fail/hang-1.pct diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 53f4c3a7f478..0ceb4dd4a4dd 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -824,8 +824,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo // read and write Bitmap bits: if ( nPixelSize == 1 || nPixelSize == 2 || nPixelSize == 4 || nPixelSize == 8 ) { - sal_uInt8 nByteCountAsByte, nFlagCounterByte; - sal_uInt16 nByteCount, nSrcBPL, nDestBPL; + sal_uInt16 nSrcBPL, nDestBPL; size_t nCount; if ( nPixelSize == 1 ) nSrcBPL = ( nWidth + 7 ) >> 3; @@ -851,6 +850,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo } else { + sal_uInt16 nByteCount(0); if ( nRowBytes > 250 ) { pPict->ReadUInt16( nByteCount ); @@ -858,14 +858,16 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo } else { + sal_uInt8 nByteCountAsByte(0); pPict->ReadUChar( nByteCountAsByte ); nByteCount = ( (sal_uInt16)nByteCountAsByte ) & 0x00ff; nDataSize += 1 + (sal_uLong)nByteCount; } - while ( nByteCount ) + while (pPict->good() && nByteCount) { - pPict->ReadUChar( nFlagCounterByte ); + sal_uInt8 nFlagCounterByte(0); + pPict->ReadUChar(nFlagCounterByte); if ( ( nFlagCounterByte & 0x80 ) == 0 ) { nCount = ( (sal_uInt16)nFlagCounterByte ) + 1; |