mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-codec: fix progressive RLGR1 decode

Browse Source
This commit is contained in:
Marc-André Moreau 2014-08-05 17:07:06 -04:00
parent 88e5bacda7
commit e6dbbfb305
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libfreerdp/codec/progressive.c
View File

@ -95,6 +95,7 @@ int rfx_rlgr1_decode(BYTE* pSrcData, UINT32 SrcSize, INT16* pDstData, UINT32 Dst
UINT32 sign;
INT16* pOutput;
wBitStream* bs;
wBitStream s_bs;
k = 1;
kp = k << LSGR;
@ -102,23 +103,20 @@ int rfx_rlgr1_decode(BYTE* pSrcData, UINT32 SrcSize, INT16* pDstData, UINT32 Dst
kr = 1;
krp = kr << LSGR;
if (!pSrcData)
return -2001;
if (!pSrcData || !SrcSize)
return -1;
if (SrcSize < 1)
return -2002;
if (!pDstData || !DstSize)
return -1;
pOutput = pDstData;
bs = BitStream_New();
if (!bs)
return -2003;
bs = &s_bs;
BitStream_Attach(bs, pSrcData, SrcSize);
BitStream_Fetch(bs);
while ((BitStream_GetRemainingLength(bs) > 0) && ((pOutput - pDstData) < DstSize))
while ((BitStream_GetRemainingLength(bs) > 1) && ((pOutput - pDstData) < DstSize))
{
if (k)
{
@ -428,9 +426,24 @@ int rfx_rlgr1_decode(BYTE* pSrcData, UINT32 SrcSize, INT16* pDstData, UINT32 Dst
}
}
BitStream_Free(bs);
offset = (int) (pOutput - pDstData);
return (int) (pOutput - pDstData);
if (offset < DstSize)
{
size = DstSize - offset;
ZeroMemory(pOutput, size * 2);
pOutput += size;
}
offset = (int) (pOutput - pDstData);
if (offset != DstSize)
return -1;
if (((bs->position + 7) / 8) != SrcSize)
return -1;
return 1;
}
int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progressive, RFX_PROGRESSIVE_TILE* tile)