XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext: xv: ProcXvListImageFormats(): use x_rpcbuf_t for payload size

Browse Source 
Use the payload size from the rpcbuf, but also compare that with our
computation as sanity check and log error on mismatch.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-18 04:19:24 +02:00
committed by Enrico Weigelt
parent 2d66d11caf
commit 5c3ce08b0e
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Xext/xvdisp.c
View File

@@ -862,22 +862,6 @@ ProcXvListImageFormats(ClientPtr client)
VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
xvListImageFormatsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_formats = pPort->pAdaptor->nImages,
.length =
bytes_to_int32(pPort->pAdaptor->nImages * sz_xvImageFormatInfo)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.num_formats);
}
WriteToClient(client, sz_xvListImageFormatsReply, &rep);
pImage = pPort->pAdaptor->pImages;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
@@ -920,6 +904,24 @@ ProcXvListImageFormats(ClientPtr client)
if (rpcbuf.error)
return BadAlloc;
if (rpcbuf.wpos != (pPort->pAdaptor->nImages*sz_xvImageFormatInfo))
LogMessage(X_WARNING, "ProcXvListImageFormats() payload_len mismatch: %ld but shoud be %d\n",
rpcbuf.wpos, (pPort->pAdaptor->nImages*sz_xvImageFormatInfo));
xvListImageFormatsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_formats = pPort->pAdaptor->nImages,
.length = bytes_to_int32(rpcbuf.wpos)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.num_formats);
}
WriteToClient(client, sz_xvListImageFormatsReply, &rep);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}