XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

randr: ProcRRListOutputProperties(): simplify by using x_rpcbuf_t

Browse Source 
* use x_rpcbuf_t for reply payload assembly and byte-swap
* do byte-swap of header fields explicitly instead of cryptic functions
* drop extra length computation

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-19 03:59:26 +02:00
committed by Enrico Weigelt
parent e93b54bcea
commit 16ab5a1456
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
randr/rrproperty.c
View File

@@ -417,47 +417,37 @@ int
ProcRRListOutputProperties(ClientPtr client)
{
REQUEST(xRRListOutputPropertiesReq);
int numProps = 0;
RROutputPtr output;
RRPropertyPtr prop;
REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);
RROutputPtr output;
VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
for (prop = output->properties; prop; prop = prop->next)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
size_t numProps = 0;
for (RRPropertyPtr prop = output->properties; prop; prop = prop->next) {
numProps++;
x_rpcbuf_write_CARD32(&rpcbuf, prop->propertyName);
}
if (rpcbuf.error)
return BadAlloc;
xRRListOutputPropertiesReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(numProps * sizeof(Atom)),
.length = x_rpcbuf_wsize_units(&rpcbuf),
.nAtoms = numProps
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.nAtoms);
}
Atom* pAtoms = calloc(sizeof(Atom), numProps);
if (numProps) {
if (!pAtoms)
return BadAlloc;
/* Copy property name atoms to reply buffer */
Atom *temppAtoms = pAtoms;
for (prop = output->properties; prop; prop = prop->next)
*temppAtoms++ = prop->propertyName;
if (client->swapped)
SwapLongs(pAtoms, numProps);
}
WriteToClient(client, sizeof(xRRListOutputPropertiesReply), &rep);
WriteToClient(client, sizeof(Atom) * numProps, pAtoms);
free(pAtoms);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}