[X2Go-Commits] [nx-libs] 02/11: nx-X11: Backport: Drop a reference to user mode after create

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 389e410283419c1dd63cfe390601118491ccd0ba
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Jul 3 22:46:27 2015 +0200

    nx-X11: Backport: Drop a reference to user mode after create
    
    User mode has no customer when create until assigned
    to some output.
    
    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)
---
 debian/changelog                                   |    6 +++++
 ...-a-reference-to-user-mode-after-crea.full.patch |   28 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65cdefe..bae4715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -269,6 +269,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
     v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
     Adds:
     - 1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch
+  * nx-X11: Drop a reference to user mode after create
+    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:
+    - 1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 17 Mar 2015 19:19:32 +0100
 
diff --git a/debian/patches/1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch b/debian/patches/1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch
new file mode 100644
index 0000000..a73a1c7
--- /dev/null
+++ b/debian/patches/1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch
@@ -0,0 +1,28 @@
+commit f45476100e7d70a51a1513f4d7737addca737bd6
+Author: Keith Packard <keithp at keithp.com>
+Date:   Wed Sep 10 13:11:09 2008 +0800
+
+    Backport: Drop a reference to user mode after create
+
+    User mode has no customer when create until assigned
+    to some output.
+
+    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/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
+index 62c0148..09c0113 100644
+--- a/nx-X11/programs/Xserver/randr/rrmode.c
++++ b/nx-X11/programs/Xserver/randr/rrmode.c
+@@ -342,7 +342,8 @@ ProcRRCreateMode (ClientPtr client)
+ 	swapl(&rep.mode, n);
+     }
+     WriteToClient(client, sizeof(xRRCreateModeReply), (char *)&rep);
+-    
++    /* Drop out reference to this mode */
++    RRModeDestroy (mode);
+     return client->noClientException;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2664161..c91269b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -137,6 +137,7 @@
 1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch
 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
 9900-dxpc-license-history.full+lite.patch
 0016_nx-X11_install-location.debian.patch
 0102_xserver-xext_set-securitypolicy-path.debian.patch

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git