diff options
author | Keith Packard <keithp@keithp.com> | 2015-07-03 23:02:14 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-07-04 01:27:36 +0200 |
commit | 9b26cc1636da2039837be7b40b26715442554c94 (patch) | |
tree | 236a95245915b180cf2321f932360f9144be6ef6 /debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch | |
parent | 389e410283419c1dd63cfe390601118491ccd0ba (diff) | |
download | nx-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/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch')
-rw-r--r-- | debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch | 30 |
1 files changed, 30 insertions, 0 deletions
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); |