diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-10-23 19:32:42 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-26 10:39:35 -0700 |
| commit | 50a5c32430a5267f2a05656d2417f9a8a44d8b97 (patch) | |
| tree | 468bf87c38fa2036db88cf19f390ca5a97357c81 | |
| parent | 9a2f6135bfb0f12ec28f304c97917d2f7c64db05 (diff) | |
dmx: Correctly compute DMXGetScreenAttributes reply length
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>
| -rw-r--r-- | hw/dmx/dmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index b8fbf02f1..a1afe76cf 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -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) { |