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

dix: use x_rpcbuf_t in ProcListProperties()

Browse Source 
Use x_rpcbuf_t for reply payload assembly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-13 17:31:40 +02:00
committed by Enrico Weigelt
parent 5d8f149a57
commit 2fddefcf8c
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dix/property.c
View File

@@ -664,41 +664,34 @@ ProcGetProperty(ClientPtr client)
int
ProcListProperties(ClientPtr client)
{
Atom *pAtoms = NULL, *temppAtoms;
int rc, numProps = 0;
WindowPtr pWin;
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
int rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
if (rc != Success)
return rc;
for (PropertyPtr pProp = pWin->properties; pProp; pProp = pProp->next)
numProps++;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (numProps) {
pAtoms = calloc(numProps, sizeof(Atom));
if (!pAtoms)
return BadAlloc;
numProps = 0;
temppAtoms = pAtoms;
for (PropertyPtr realProp, pProp = pWin->properties; pProp; pProp = pProp->next) {
realProp = pProp;
rc = XaceHookPropertyAccess(client, pWin, &realProp, DixGetAttrAccess);
if (rc == Success && realProp == pProp) {
*temppAtoms++ = pProp->propertyName;
numProps++;
}
size_t numProps = 0;
for (PropertyPtr realProp, pProp = pWin->properties; pProp; pProp = pProp->next) {
realProp = pProp;
rc = XaceHookPropertyAccess(client, pWin, &realProp, DixGetAttrAccess);
if (rc == Success && realProp == pProp) {
x_rpcbuf_write_CARD32(&rpcbuf, pProp->propertyName);
numProps++;
}
}
if (rpcbuf.error)
return BadAlloc;
xListPropertiesReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(numProps * sizeof(Atom)),
.length = x_rpcbuf_wsize_units(&rpcbuf),
.nProperties = numProps
};
@@ -706,13 +699,10 @@ ProcListProperties(ClientPtr client)
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.nProperties);
SwapLongs(pAtoms, numProps);
}
WriteToClient(client, sizeof(rep), &rep);
WriteToClient(client, numProps * sizeof(Atom), pAtoms);
free(pAtoms);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}