aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2015-07-03 23:40:57 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-04 01:27:55 +0200
commit44b913275b60fa4e95d76c2918426d7f7d70752a (patch)
treedd3b66a6ca6ef5f1bd2dd56afcf1a9ef501aff7a /debian
parent9b26cc1636da2039837be7b40b26715442554c94 (diff)
downloadnx-libs-44b913275b60fa4e95d76c2918426d7f7d70752a.tar.gz
nx-libs-44b913275b60fa4e95d76c2918426d7f7d70752a.tar.bz2
nx-libs-44b913275b60fa4e95d76c2918426d7f7d70752a.zip
nx-X11: Backport: randr: check for virtual size limits before set crtc
Return a error if the screen is configured to an invalid size. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com> 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)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch41
-rw-r--r--debian/patches/series1
3 files changed, 48 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e4107223a..3802f15c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -281,6 +281,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- 1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch
+ * nx-X11: randr: check for virtual size limits before set crtc
+ 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:
+ - 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
diff --git a/debian/patches/1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch b/debian/patches/1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
new file mode 100644
index 000000000..d89432cef
--- /dev/null
+++ b/debian/patches/1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
@@ -0,0 +1,41 @@
+commit da678db0ef57c45f1bbe1c0e8f14da70746ed2cd
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Dec 17 16:09:35 2010 +0200
+
+ Backport: randr: check for virtual size limits before set crtc
+
+ Return a error if the screen is configured to an invalid size.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+ 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 9b3935e..9bea97b 100644
+--- a/nx-X11/programs/Xserver/randr/rrscreen.c
++++ b/nx-X11/programs/Xserver/randr/rrscreen.c
+@@ -938,6 +938,18 @@ ProcRRSetScreenConfig (ClientPtr client)
+ width = mode->mode.height;
+ height = mode->mode.width;
+ }
++
++ if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
++ client->errorValue = width;
++ free(pData);
++ return BadValue;
++ }
++ if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
++ client->errorValue = height;
++ free(pData);
++ return BadValue;
++ }
++
+ if (width != pScreen->width || height != pScreen->height)
+ {
+ int c;
diff --git a/debian/patches/series b/debian/patches/series
index d24ed1fe1..61a638224 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -139,6 +139,7 @@
1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.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
+1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch