diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-14 12:43:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-15 09:40:11 +0000 |
| commit | 481a564d97b02cc8f6d21672994c55d3b2ddc137 (patch) | |
| tree | f9b01f42015ec2f3510086a7532bc645afca5b74 | |
| parent | 46e1e1292ac801598e1f43657a1320c45ef8776d (diff) | |
use same limit in ProcessOneCode as AddToTable
Change-Id: Id0345e5d867d18bf7eb341f04086226b7fa79680
(cherry picked from commit 59197f1892777a5629bad210b9ed1071ed550570)
Reviewed-on: https://gerrit.libreoffice.org/17042
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/filter/igif/decode.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index 2b445e9e1d5a..0008f6317d3c 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -109,11 +109,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData ) { - GIFLZWTableEntry* pE; - if( nTableSize < 4096 ) { - pE = pTable + nTableSize; + GIFLZWTableEntry* pE = pTable + nTableSize; pE->pPrev = pTable + nPrevCode; pE->pFirst = pE->pPrev->pFirst; GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst; @@ -130,7 +128,6 @@ bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirst bool GIFLZWDecompressor::ProcessOneCode() { - GIFLZWTableEntry* pE; sal_uInt16 nCode; bool bRet = false; bool bEndOfBlock = false; @@ -193,11 +190,11 @@ bool GIFLZWDecompressor::ProcessOneCode() nOldCode = nCode; - if (nCode > 4096) + if (nCode >= 4096) return false; // write character(/-sequence) of code nCode in the output buffer: - pE = pTable + nCode; + GIFLZWTableEntry* pE = pTable + nCode; do { if (pOutBufData == pOutBuf) //can't go back past start |