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

Xext: xv: ProcXvQueryPortAttributes(): use payload size of rpcbuf

Browse Source 
Instead doing an exrtra loop for our own calculation of the
payload size, just the wpos from rpcbuf.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-17 23:01:23 +02:00
committed by Enrico Weigelt
parent 29963d878f
commit b3adbc30d3
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Xext/xvdisp.c
View File

@@ -578,14 +578,21 @@ ProcXvQueryPortAttributes(ClientPtr client)
for (i = 0, pAtt = pPort->pAdaptor->pAttributes;
i < pPort->pAdaptor->nAttributes; i++, pAtt++) {
textSize += pad_to_int32(strlen(pAtt->name) + 1);
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->flags);
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->min_value);
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->max_value);
x_rpcbuf_write_CARD32(&rpcbuf, pad_to_int32(strlen(pAtt->name)+1)); /* pass the NULL */
x_rpcbuf_write_string_0t_pad(&rpcbuf, pAtt->name);
}
if (rpcbuf.error)
return BadAlloc;
xvQueryPortAttributesReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.num_attributes = pPort->pAdaptor->nAttributes,
.length = bytes_to_int32(
(pPort->pAdaptor->nAttributes * sz_xvAttributeInfo) + textSize),
.length = bytes_to_int32(rpcbuf.wpos),
.text_size = textSize,
};
@@ -596,18 +603,6 @@ ProcXvQueryPortAttributes(ClientPtr client)
swapl(&rep.text_size);
}
for (i = 0, pAtt = pPort->pAdaptor->pAttributes;
i < pPort->pAdaptor->nAttributes; i++, pAtt++) {
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->flags);
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->min_value);
x_rpcbuf_write_CARD32(&rpcbuf, pAtt->max_value);
x_rpcbuf_write_CARD32(&rpcbuf, pad_to_int32(strlen(pAtt->name)+1)); /* pass the NULL */
x_rpcbuf_write_string_n_pad(&rpcbuf, pAtt->name);
}
if (rpcbuf.error)
return BadAlloc;
WriteToClient(client, sizeof(rep), &rep);
WriteRpcbufToClient(client, &rpcbuf);
return Success;