Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-22 07:01:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[idd] lgmp: reject invalid frame layouts

Browse Source
This commit is contained in:
Geoffrey McRae
2026-08-17 00:59:27 +10:00
parent e08e03bec0
commit 86b83f3e23
1 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
idd/LGIdd/transport/lgmp/CLGMPFrameTransport.cpp
View File

@@ -732,17 +732,60 @@ SinkTarget CLGMPFrameTransport::PrepareFrameBuffer(
{ {
SinkTarget result = {}; SinkTarget result = {};
const unsigned dataWidth = dstFormat.dataWidth ? const D3D12_RESOURCE_DESC& desc = dstFormat.desc;
dstFormat.dataWidth : (unsigned)dstFormat.desc.Width; const unsigned dataWidth = dstFormat.dataWidth;
const unsigned dataHeight = dstFormat.dataHeight ? const unsigned dataHeight = dstFormat.dataHeight;
dstFormat.dataHeight : dstFormat.desc.Height;
if (dstFormat.format == FRAME_TYPE_INVALID) unsigned bpp = 0;
bool validLayout = false;
switch (dstFormat.format)
{ {
case FRAME_TYPE_BGRA:
case FRAME_TYPE_RGBA:
case FRAME_TYPE_RGBA10:
case FRAME_TYPE_RGBA16F:
bpp = dstFormat.format == FRAME_TYPE_RGBA16F ? 8 : 4;
validLayout =
desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
D12::Type(desc.Format) == dstFormat.format &&
dataWidth == desc.Width &&
dataHeight == desc.Height &&
dstFormat.width == desc.Width &&
dstFormat.height == desc.Height &&
dstFormat.pitch == 0;
break;
case FRAME_TYPE_BGR_32:
bpp = 4;
validLayout =
desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
dstFormat.pitch == pitch &&
pitch % bpp == 0 &&
dataWidth == pitch / bpp &&
dataHeight == dstFormat.height &&
(UINT64)dstFormat.width * 3 <= pitch &&
(UINT64)pitch * dataHeight <= desc.Width;
break;
default:
DEBUG_ERROR("Unsupported frame format, skipping frame"); DEBUG_ERROR("Unsupported frame format, skipping frame");
return result; return result;
} }
const UINT64 rowBytes = (UINT64)dataWidth * bpp;
if (!pitch || !dataWidth || !dataHeight || !dstFormat.width ||
!dstFormat.height || pitch % bpp || rowBytes > pitch ||
!validLayout)
{
DEBUG_ERROR(
"Invalid frame layout: resource=%u data=%ux%u frame=%ux%u "
"pitch=%u format=%u",
(unsigned)desc.Dimension,
dataWidth, dataHeight, dstFormat.width, dstFormat.height,
pitch, (unsigned)dstFormat.format);
return result;
}
CSRWExclusiveLock lock(m_framePublishLock); CSRWExclusiveLock lock(m_framePublishLock);
const bool ownerBlocked = schedule.clientID && const bool ownerBlocked = schedule.clientID &&
CountOwnerDeliveries(schedule.clientID) >= LGMP_Q_FRAME_LEN; CountOwnerDeliveries(schedule.clientID) >= LGMP_Q_FRAME_LEN;
@@ -842,7 +885,6 @@ SinkTarget CLGMPFrameTransport::PrepareFrameBuffer(
KVMFRFrame * fi = m_frame[frameIndex]; KVMFRFrame * fi = m_frame[frameIndex];
const unsigned maxRows = (unsigned)(m_maxFrameSize / pitch); const unsigned maxRows = (unsigned)(m_maxFrameSize / pitch);
const int bpp = dstFormat.format == FRAME_TYPE_RGBA16F ? 8 : 4;
KVMFRFrameFlags flags = KVMFRFrameFlags flags =
(dstFormat.hdr ? FRAME_FLAG_HDR : 0) | (dstFormat.hdr ? FRAME_FLAG_HDR : 0) |
(dstFormat.hdrPQ ? FRAME_FLAG_HDR_PQ : 0) | (dstFormat.hdrPQ ? FRAME_FLAG_HDR_PQ : 0) |