aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-07-03 23:02:14 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-04 01:27:36 +0200
commit9b26cc1636da2039837be7b40b26715442554c94 (patch)
tree236a95245915b180cf2321f932360f9144be6ef6 /debian
parent389e410283419c1dd63cfe390601118491ccd0ba (diff)
downloadnx-libs-9b26cc1636da2039837be7b40b26715442554c94.tar.gz
nx-libs-9b26cc1636da2039837be7b40b26715442554c94.tar.bz2
nx-libs-9b26cc1636da2039837be7b40b26715442554c94.zip
nx-X11: Backport: Free randr crtc and output pointer arrays
All of the crts and outputs were freed, but not the arrays full of pointers to them. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 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/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch30
-rw-r--r--debian/patches/series1
3 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bae471582..e4107223a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -275,6 +275,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- 1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch
+ * nx-X11: Free randr crtc and output pointer arrays
+ 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:
+ - 1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
diff --git a/debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch b/debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch
new file mode 100644
index 000000000..6c6b1d0c9
--- /dev/null
+++ b/debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch
@@ -0,0 +1,30 @@
+commit 2aeb7671963932d5ddb771ad641969e20bb9aa25
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 17 18:14:37 2009 -0700
+
+ Backport: Free randr crtc and output pointer arrays
+
+ All of the crts and outputs were freed, but not the arrays full of
+ pointers to them.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+ 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/randr.c b/nx-X11/programs/Xserver/randr/randr.c
+index 81df406..f565617 100644
+--- a/nx-X11/programs/Xserver/randr/randr.c
++++ b/nx-X11/programs/Xserver/randr/randr.c
+@@ -125,6 +125,8 @@ RRCloseScreen (int i, ScreenPtr pScreen)
+ for (j = pScrPriv->numOutputs - 1; j >= 0; j--)
+ RROutputDestroy (pScrPriv->outputs[j]);
+
++ xfree (pScrPriv->crtcs);
++ xfree (pScrPriv->outputs);
+ xfree (pScrPriv);
+ RRNScreens -= 1; /* ok, one fewer screen with RandR running */
+ return (*pScreen->CloseScreen) (i, pScreen);
diff --git a/debian/patches/series b/debian/patches/series
index c91269b46..d24ed1fe1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -138,6 +138,7 @@
1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
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
9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch