xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++++++
debian/patches/51_xevie-length.diff | 42 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 50 insertions(+)
New commits:
commit c68fab55b468a46b4713e47d0a1aac7df0a0b019
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 1 19:23:15 2008 +0200
Xevie: always set rep.length to 0 (closes: #497337).
Thanks, Thorvald Natvig!
diff --git a/debian/changelog b/debian/changelog
index ac9b26b..5842698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.2-6) UNRELEASED; urgency=low
+
+ * Xevie: always set rep.length to 0 (closes: #497337). Thanks, Thorvald
+ Natvig!
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 01 Sep 2008 19:21:18 +0200
+
xorg-server (2:1.4.2-5) unstable; urgency=low
* Don't pretend we support randr 1.2 when queried by swapped clients. The
diff --git a/debian/patches/51_xevie-length.diff b/debian/patches/51_xevie-length.diff
new file mode 100644
index 0000000..eb8d4a2
--- /dev/null
+++ b/debian/patches/51_xevie-length.diff
@@ -0,0 +1,42 @@
+From: Thorvald Natvig <thorvald@natvig.com>
+Subject: fix XEvIE
+
+For all the replys but ProcXevieQueryVersion, the rep.length field isn't
+set to zero, which makes the client misbehave when it gets the reply.
+
+Index: xorg-server/Xext/xevie.c
+===================================================================
+--- xorg-server.orig/Xext/xevie.c
++++ xorg-server/Xext/xevie.c
+@@ -213,6 +213,7 @@
+
+ xevieModifiersOn = FALSE;
+
++ rep.length = 0;
+ rep.type = X_Reply;
+ rep.sequence_number = client->sequence;
+ WriteToClient (client, sizeof (xXevieStartReply), (char *)&rep);
+@@ -232,6 +233,7 @@
+ XevieEnd(xevieClientIndex);
+ }
+
++ rep.length = 0;
+ rep.type = X_Reply;
+ rep.sequence_number = client->sequence;
+ WriteToClient (client, sizeof (xXevieEndReply), (char *)&rep);
+@@ -250,6 +252,7 @@
+ return BadAccess;
+
+ xE = (xEvent *)&stuff->event;
++ rep.length = 0;
+ rep.type = X_Reply;
+ rep.sequence_number = client->sequence;
+ WriteToClient (client, sizeof (xXevieSendReply), (char *)&rep);
+@@ -294,6 +297,7 @@
+ return BadAccess;
+
+ xevieMask = (long)stuff->event_mask;
++ rep.length = 0;
+ rep.type = X_Reply;
+ rep.sequence_number = client->sequence;
+ WriteToClient (client, sizeof (xXevieSelectInputReply), (char *)&rep);
diff --git a/debian/patches/series b/debian/patches/series
index c6c3dbc..4d71c53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,6 +24,7 @@
48_xaa_nooffscreenpixmaps.diff
49_x86emu_int1a_fix.diff
50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch
+51_xevie-length.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
Reply to: