mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#668: more complete fix

Browse Source 
This reverts commit f01a975cb2.

Change-Id: I18d11dcc137c20d54076e3c4117c10f2dd80efda
Reviewed-on: https://gerrit.libreoffice.org/34738
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-03-01 09:36:50 +00:00
parent b3020a00e8
commit b79d0136b5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
filter/source/graphicfilter/itiff/ccidecom.cxx
View File

@@ -627,7 +627,9 @@ void CCIDecompressor::StartDecompression( SvStream & rIStream )
bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine ) bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine )
{ {
bool b2D; //Read[1|2]DScanlineData take a sal_uInt16, so its either limit here or expand there
if (nTargetBits > SAL_MAX_UINT16)
return false;
if ( nEOLCount >= 5 ) // RTC (Return To Controller) if ( nEOLCount >= 5 ) // RTC (Return To Controller)
return true; return true;
@@ -682,6 +684,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget
if ( nOptions & CCI_OPTION_BYTEALIGNROW ) if ( nOptions & CCI_OPTION_BYTEALIGNROW )
nInputBitsBufSize &= 0xfff8; nInputBitsBufSize &= 0xfff8;
bool b2D;
// is it a 2D row? // is it a 2D row?
if ( nOptions & CCI_OPTION_2D ) if ( nOptions & CCI_OPTION_2D )
{ {