Commit 09cb7b2d authored by Julien Cristau's avatar Julien Cristau Committed by Mihai Moldovan

nx-X11: Backport: randr: fix server crash in RRGetScreenInfo

We don't return rates to randr < 1.1 clients, so don't allocate space for them. This fixes a FatalError due to not all allocated space being used. X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> Reported-by: 's avatarGuillaume Quintin <coincoin169g@gmail.com> Signed-off-by: 's avatarJulien Cristau <jcristau@debian.org> Backported from Arctica GH 3.6.x branch. v2: backport to nx-libs 3.6.x (Ulrich Sibiller) v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
parent 44b91327
...@@ -287,6 +287,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low ...@@ -287,6 +287,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds: Adds:
- 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch - 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
* nx-X11: randr: fix server crash in RRGetScreenInfo
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- 1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
......
commit faddfbec6ff331c3859e2f57040da4a8cf072baa
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 22 09:54:38 2009 +0200
Backport: randr: fix server crash in RRGetScreenInfo
We don't return rates to randr < 1.1 clients, so don't allocate space
for them. This fixes a FatalError due to not all allocated space being
used.
X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>
Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
index 9bea97b..20eed11 100644
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -677,8 +677,9 @@ ProcRRGetScreenInfo (ClientPtr client)
rep.sizeID = pData->size;
rep.rate = pData->refresh;
- extraLen = (rep.nSizes * sizeof (xScreenSizes) +
- rep.nrateEnts * sizeof (CARD16));
+ extraLen = rep.nSizes * sizeof (xScreenSizes);
+ if (has_rate)
+ extraLen += rep.nrateEnts * sizeof (CARD16);
if (extraLen)
{
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch 1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch
1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch 1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch
1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch
9900-dxpc-license-history.full+lite.patch 9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch 0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch 0102_xserver-xext_set-securitypolicy-path.debian.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment