frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

randr: no need to for local temp buffer in ProcRRQueryProviderProperty() 

The code can be much simpler by just using CopySwap32Write().
And we also don't need the callback in WriteSwappedDataToClient(),
just call the corresponding write function directly.

This also makes some analyzer warnings go away.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-13 13:46:18 +02:00
parent b535db955a
commit 2e05296905
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
randr/rrproviderproperty.c
View File

@ -380,7 +380,6 @@ ProcRRQueryProviderProperty(ClientPtr client)
REQUEST(xRRQueryProviderPropertyReq); REQUEST(xRRQueryProviderPropertyReq);
RRProviderPtr provider; RRProviderPtr provider;
RRPropertyPtr prop; RRPropertyPtr prop;
char *extra = NULL;
REQUEST_SIZE_MATCH(xRRQueryProviderPropertyReq); REQUEST_SIZE_MATCH(xRRQueryProviderPropertyReq);
@ -390,12 +389,6 @@ ProcRRQueryProviderProperty(ClientPtr client)
if (!prop) if (!prop)
return BadName; return BadName;
if (prop->num_valid) {
extra = xallocarray(prop->num_valid, sizeof(INT32));
if (!extra)
return BadAlloc;
}
xRRQueryProviderPropertyReply rep = { xRRQueryProviderPropertyReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
@ -410,11 +403,10 @@ ProcRRQueryProviderProperty(ClientPtr client)
} }
WriteToClient(client, sizeof(xRRQueryProviderPropertyReply), (char *) &rep); WriteToClient(client, sizeof(xRRQueryProviderPropertyReply), (char *) &rep);
if (prop->num_valid) { if (prop->num_valid) {
memcpy(extra, prop->valid_values, prop->num_valid * sizeof(INT32)); if (client->swapped)
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; CopySwap32Write(client, prop->num_valid * sizeof(INT32), (CARD32*)prop->valid_values);
WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32), else
extra); WriteToClient(client, prop->num_valid * sizeof(INT32), prop->valid_values);
free(extra);
} }
return Success; return Success;
} }