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

randr: use x_rpcbuf_t in ProcRRGetProviderProperty()

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 16:14:14 +02:00
committed by Enrico Weigelt
parent 828135fd3e
commit 4454a26545
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
randr/rrproviderproperty.c
View File

@@ -535,7 +535,6 @@ ProcRRGetProviderProperty(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence
};
char *extra = NULL;
REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq);
if (stuff->delete)
@@ -608,11 +607,6 @@ ProcRRGetProviderProperty(ClientPtr client)
len = min(n - ind, 4 * stuff->longLength);
if (len) {
extra = calloc(1, len);
if (!extra)
return BadAlloc;
}
reply.bytesAfter = n - (ind + len);
reply.format = prop_value->format;
reply.length = bytes_to_int32(len);
@@ -639,25 +633,29 @@ ProcRRGetProviderProperty(ClientPtr client)
swapl(&reply.bytesAfter);
swapl(&reply.nItems);
}
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (len) {
memcpy(extra, (char *) prop_value->data + ind, len);
switch (reply.format) {
const char *dataptr = ((char*)prop_value->data) + ind;
switch (prop_value->format) {
case 32:
if (client->swapped)
SwapLongs((CARD32*) extra, len/sizeof(CARD32));
x_rpcbuf_write_CARD32s(&rpcbuf, (CARD32*)dataptr, len/sizeof(CARD32));
break;
case 16:
if (client->swapped)
SwapShorts((short*) extra, len/sizeof(CARD16));
x_rpcbuf_write_CARD16s(&rpcbuf, (CARD16*)dataptr, len/sizeof(CARD16));
break;
default:
x_rpcbuf_write_CARD8s(&rpcbuf, (CARD8*)dataptr, len);
break;
}
}
if (rpcbuf.error)
return BadAlloc;
WriteToClient(client, sizeof(xGenericReply), &reply);
WriteToClient(client, len, extra);
free(extra);
WriteRpcbufToClient(client, &rpcbuf);
if (stuff->delete && (reply.bytesAfter == 0)) { /* delete the Property */
*prev = prop->next;