ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: use use x_rpcbuf_wsize_units() instead of rpcbuf.wpos

Browse Source 
In the request handlers, use x_rpcbuf_wsize_units() for payload length
computation.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-08-14 13:31:41 +02:00 committed by Enrico Weigelt
parent 15fdd0ae20
commit 8ea70e9e78
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Xext/xvdisp.c
View File

@ -136,7 +136,7 @@ ProcXvQueryAdaptors(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_adaptors = numAdaptors,
.length = bytes_to_int32(rpcbuf.wpos)
.length = x_rpcbuf_wsize_units(&rpcbuf)
};
if (client->swapped) {
@ -184,7 +184,7 @@ ProcXvQueryEncodings(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_encodings = pPort->pAdaptor->nEncodings,
.length = bytes_to_int32(rpcbuf.wpos),
.length = x_rpcbuf_wsize_units(&rpcbuf),
};
if (client->swapped) {
@ -592,7 +592,7 @@ ProcXvQueryPortAttributes(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_attributes = pPort->pAdaptor->nAttributes,
.length = bytes_to_int32(rpcbuf.wpos),
.length = x_rpcbuf_wsize_units(&rpcbuf),
.text_size = textSize,
};
@ -827,7 +827,7 @@ ProcXvQueryImageAttributes(ClientPtr client)
xvQueryImageAttributesReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(rpcbuf.wpos), /* in 32bit units */
.length = x_rpcbuf_wsize_units(&rpcbuf),
.num_planes = num_planes,
.width = width,
.height = height,
@ -841,7 +841,9 @@ ProcXvQueryImageAttributes(ClientPtr client)
swapl(&rep.data_size);
swaps(&rep.width);
swaps(&rep.height);
SwapLongs((CARD32 *) offsets, rep.length);
/* needed here, because ddQueryImageAttributes() directly wrote into
our rpcbuf area */
SwapLongs((CARD32 *) offsets, x_rpcbuf_wsize_units(&rpcbuf));
}
WriteToClient(client, sz_xvQueryImageAttributesReply, &rep);
@ -904,6 +906,7 @@ ProcXvListImageFormats(ClientPtr client)
if (rpcbuf.error)
return BadAlloc;
/* use rpc.wpos here, in order to get how much we've really written */
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));
@ -912,7 +915,7 @@ ProcXvListImageFormats(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_formats = pPort->pAdaptor->nImages,
.length = bytes_to_int32(rpcbuf.wpos)
.length = x_rpcbuf_wsize_units(&rpcbuf)
};
if (client->swapped) {

1
xkb/xkb.c
View File

@ -1503,6 +1503,7 @@ ProcXkbGetMap(ClientPtr client)
if (!x_rpcbuf_makeroom(&rpcbuf, payload_len))
return BadAlloc;
/* use rpcbuf.wpos here, in order to get how much we've really written */
if (rpcbuf.wpos != payload_len)
LogMessage(X_WARNING, "ProcXkbGetMap() payload_len mismatch: %ld but shoud be %d\n",
rpcbuf.wpos, payload_len);