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

Revert "randr: ProcRRGetMonitors(): collect reply payload in temporary buffer" 

This reverts commit 1bc6ca30a9.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012>
This commit is contained in:
Alan Coopersmith 2025-06-11 13:42:33 -07:00
parent 896d9d3be8
commit a205917752
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
randr/rrmonitor.c
View File

@ -604,13 +604,11 @@ ProcRRGetMonitors(ClientPtr client)
noutputs += monitors[m].numOutputs; noutputs += monitors[m].numOutputs;
} }
int payload_len = noutputs * sizeof(CARD32) + nmonitors * sizeof(xRRMonitorInfo);
xRRGetMonitorsReply rep = { xRRGetMonitorsReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.timestamp = RRMonitorTimestamp(screen), .timestamp = RRMonitorTimestamp(screen),
.length = bytes_to_int32(payload_len), .length = noutputs + nmonitors * bytes_to_int32(sizeof(xRRMonitorInfo)),
.nmonitors = nmonitors, .nmonitors = nmonitors,
.noutputs = noutputs, .noutputs = noutputs,
}; };
@ -624,18 +622,9 @@ ProcRRGetMonitors(ClientPtr client)
} }
WriteToClient(client, sizeof(xRRGetMonitorsReply), &rep); WriteToClient(client, sizeof(xRRGetMonitorsReply), &rep);
char *payload_buf = calloc(1, payload_len);
if (!payload_buf) {
RRMonitorFreeList(monitors, nmonitors);
return BadAlloc;
}
char *walk = payload_buf;
for (m = 0; m < nmonitors; m++) { for (m = 0; m < nmonitors; m++) {
RRMonitorPtr monitor = &monitors[m]; RRMonitorPtr monitor = &monitors[m];
xRRMonitorInfo *info = (xRRMonitorInfo*) walk; xRRMonitorInfo info = {
*info = (xRRMonitorInfo) {
.name = monitor->name, .name = monitor->name,
.primary = monitor->primary, .primary = monitor->primary,
.automatic = monitor->automatic, .automatic = monitor->automatic,
@ -648,27 +637,26 @@ ProcRRGetMonitors(ClientPtr client)
.heightInMillimeters = monitor->geometry.mmHeight, .heightInMillimeters = monitor->geometry.mmHeight,
}; };
if (client->swapped) { if (client->swapped) {
swapl(&info->name); swapl(&info.name);
swaps(&info->noutput); swaps(&info.noutput);
swaps(&info->x); swaps(&info.x);
swaps(&info->y); swaps(&info.y);
swaps(&info->width); swaps(&info.width);
swaps(&info->height); swaps(&info.height);
swapl(&info->widthInMillimeters); swapl(&info.widthInMillimeters);
swapl(&info->heightInMillimeters); swapl(&info.heightInMillimeters);
} }
walk += sizeof(xRRMonitorInfo); RROutput outputs[monitor->numOutputs];
memcpy(walk, monitor->outputs, monitor->numOutputs * sizeof (RROutput)); memcpy(outputs, monitor->outputs, monitor->numOutputs * sizeof (RROutput));
if (client->swapped)
SwapLongs((CARD32*)walk, monitor->numOutputs);
walk += monitor->numOutputs * sizeof (RROutput); if (client->swapped)
SwapLongs(outputs, monitor->numOutputs);
WriteToClient(client, sizeof(xRRMonitorInfo), &info);
WriteToClient(client, sizeof(outputs), outputs);
} }
WriteToClient(client, payload_len, payload_buf);
free(payload_buf);
RRMonitorFreeList(monitors, nmonitors); RRMonitorFreeList(monitors, nmonitors);
return Success; return Success;