mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[codec,xcrush] fix a regression with xcrush_generate_output

This commit is contained in:
akallabeth 2024-11-12 17:12:00 +01:00
parent 08d21e9f09
commit 387147bb4e
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/codec/xcrush.c
View File

@ -759,7 +759,7 @@ static int xcrush_generate_output(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush,
CopyMemory(Literals, &xcrush->HistoryBuffer[CurrentOffset], HistoryOffsetDiff);
const intptr_t diff = Literals + HistoryOffsetDiff - OutputBuffer;
if (diff > UINT32_MAX)
if ((diff < 0) || (diff > UINT32_MAX))
return -1;
*pDstSize = (UINT32)diff;
return 1;
@ -913,11 +913,15 @@ static int xcrush_decompress_l1(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush,
HistoryPtr += OutputLength;
}
const intptr_t diff = HistoryPtr - xcrush->HistoryPtr;
if (diff > UINT32_MAX)
const intptr_t diff = HistoryPtr - HistoryBuffer;
if ((diff < 0) || (diff > UINT32_MAX))
return -1;
xcrush->HistoryOffset = (UINT32)diff;
*pDstSize = xcrush->HistoryOffset;
const intptr_t sizediff = HistoryPtr - xcrush->HistoryPtr;
if ((sizediff < 0) || (sizediff > UINT32_MAX))
return -1;
*pDstSize = (UINT32)sizediff;
*ppDstData = xcrush->HistoryPtr;
return 1;
}