nx-X11: Backport: Free randr crtc and output pointer arrays

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
 

debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch

+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);    

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