morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

[codec,h264] validate rectangles before use

Browse Source
This commit is contained in:
Armin Novak
2026-02-28 11:38:23 +01:00
parent ed2e238095
commit 6482b7a92f
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libfreerdp/codec/h264.c
View File

@@ -108,6 +108,36 @@ BOOL avc420_ensure_buffer(H264_CONTEXT* h264, UINT32 stride, UINT32 width, UINT3
return yuv_ensure_buffer(h264, stride, width, height);
}
static BOOL isRectValid(UINT32 width, UINT32 height, const RECTANGLE_16* rect)
{
WINPR_ASSERT(rect);
if (rect->left > width)
return FALSE;
if (rect->right > width)
return FALSE;
if (rect->left >= rect->right)
return FALSE;
if (rect->top > height)
return FALSE;
if (rect->bottom > height)
return FALSE;
if (rect->top >= rect->bottom)
return FALSE;
return TRUE;
}
static BOOL areRectsValid(UINT32 width, UINT32 height, const RECTANGLE_16* rects, UINT32 count)
{
WINPR_ASSERT(rects || (count == 0));
for (size_t x = 0; x < count; x++)
{
const RECTANGLE_16* rect = &rects[x];
if (!isRectValid(width, height, rect))
return FALSE;
}
return TRUE;
}
INT32 avc420_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize, BYTE* pDstData,
DWORD DstFormat, UINT32 nDstStep, WINPR_ATTR_UNUSED UINT32 nDstWidth,
WINPR_ATTR_UNUSED UINT32 nDstHeight, const RECTANGLE_16* regionRects,
@@ -119,6 +149,9 @@ INT32 avc420_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize
if (!h264 || h264->Compressor)
return -1001;
if (!areRectsValid(nDstWidth, nDstHeight, regionRects, numRegionRects))
return -1013;
status = h264->subsystem->Decompress(h264, pSrcData, SrcSize);
if (status == 0)
@@ -567,6 +600,11 @@ INT32 avc444_decompress(H264_CONTEXT* h264, BYTE op, const RECTANGLE_16* regionR
if (!h264 || !regionRects || !pSrcData || !pDstData || h264->Compressor)
return -1001;
if (!areRectsValid(nDstWidth, nDstHeight, regionRects, numRegionRects))
return -1013;
if (!areRectsValid(nDstWidth, nDstHeight, auxRegionRects, numAuxRegionRect))
return -1014;
switch (op)
{
case 0: /* YUV420 in stream 1