fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-13 00:08:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dmx: Correctly compute DMXGetScreenAttributes reply length

Browse source 
Correctly allow for excess length of DMXGetScreenAttributes reply
over standard 32 byte reply in addition to the displayName string
when computing the length of reply

http://bugs.freedesktop.org/show_bug.cgi?id=24685

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by:  Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 50a5c32430)
This commit is contained in:
Jon TURNEY 2009-10-23 19:32:42 +01:00 • committed by Peter Hutterer
parent 48329b2c5c
commit 6e2f5912b6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/dmx/dmx.c
View file

@ -362,7 +362,8 @@ static int ProcDMXGetScreenAttributes(ClientPtr client)
paddedLength = pad_to_int32(length);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = bytes_to_int32(paddedLength);
rep.length = bytes_to_int32((sizeof(xDMXGetScreenAttributesReply) - sizeof(xGenericReply))
+ paddedLength);
rep.displayNameLength = length;
if (client->swapped) {