summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-05 10:56:32 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-01-05 16:00:27 +0100
commitd83cbc12afb9b6b91533d329015981d26adf8918 (patch)
treed736ec580c22aefdb06b700d877e57ad9dd99352
parent80817430ee98fad2e6ada52a52741ef9992f4a44 (diff)
asan wrt mandriva57054-1.tiff
Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5 (cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729) Reviewed-on: https://gerrit.libreoffice.org/13739 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index aa80b097e5d0..54efd86d0abb 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -934,23 +934,22 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
{
case 8 :
{
- sal_uInt8 nLast;
if ( bByteSwap )
{
if ( nPredictor == 2 )
{
- nLast = BYTESWAP( (sal_uInt8)*pt++ );
+ sal_uInt8 nLast = 0;
for ( nx = 0; nx < nImageWidth; nx++ )
{
+ nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ ) : *pt++;
pAcc->SetPixelIndex( nY, nx, nLast );
- nLast = nLast + *pt++;
}
}
else
{
for ( nx = 0; nx < nImageWidth; nx++ )
{
- nLast = *pt++;
+ sal_uInt8 nLast = *pt++;
pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * nMinMax ) );
}
}
@@ -959,11 +958,11 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
{
if ( nPredictor == 2 )
{
- nLast = *pt++;
+ sal_uInt8 nLast = 0;
for ( nx = 0; nx < nImageWidth; nx++ )
{
+ nLast += *pt++;
pAcc->SetPixelIndex( nY, nx, nLast );
- nLast = nLast + *pt++;
}
}
else