diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch | |
parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip |
Merge branch '3.6.x'
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 | 28 |
1 files changed, 0 insertions, 28 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 deleted file mode 100644 index 14b08600f..000000000 --- a/debian/patches/1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch +++ /dev/null @@ -1,28 +0,0 @@ -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) - ---- 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); |