[pkg-remote-commits] [xrdp] 01/02: Fix RFX with large tile sets, e.g. full HD displays.

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 10a51c5909508b1d5e298dd85117c11ba88cc8fa
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Feb 17 13:22:12 2017 +0100

    Fix RFX with large tile sets, e.g. full HD displays.
---
 debian/changelog            |  6 ++++++
 debian/patches/highres.diff | 31 +++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63ed568..fcb4efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.1-7) UNRELEASED; urgency=medium
+
+  * Fix RFX with large tile sets, e.g. full HD displays. (Closes: #855387)
+
+ -- Dominik George <nik at naturalnet.de>  Fri, 17 Feb 2017 13:21:12 +0100
+
 xrdp (0.9.1-6) unstable; urgency=medium
 
   * Fix japanese keyboard detection. (Closes: #854847)
diff --git a/debian/patches/highres.diff b/debian/patches/highres.diff
new file mode 100644
index 0000000..01ee95e
--- /dev/null
+++ b/debian/patches/highres.diff
@@ -0,0 +1,31 @@
+From: Tim Fischer
+Subject: RFX fixes for large tile sets
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855387
+Bug: https://github.com/neutrinolabs/xrdp/issues/524
+--- a/xrdp/xrdp_encoder.c
++++ b/xrdp/xrdp_encoder.c
+@@ -320,21 +320,16 @@ process_enc_rfx(struct xrdp_encoder *sel
+     mutex = self->mutex;
+     event_processed = self->xrdp_encoder_event_processed;
+ 
+-    if ((enc->num_crects > 512) || (enc->num_drects > 512))
+-    {
+-        return 0;
+-    }
+-
+     out_data_bytes = 16 * 1024 * 1024;
+-    index = 256 + sizeof(struct rfx_tile) * 512 +
+-                  sizeof(struct rfx_rect) * 512;
++    index = 256 + sizeof(struct rfx_tile) * enc->num_crects +
++                  sizeof(struct rfx_rect) * enc->num_drects;
+     out_data = (char *) g_malloc(out_data_bytes + index, 0);
+     if (out_data == 0)
+     {
+         return 0;
+     }
+     tiles = (struct rfx_tile *) (out_data + out_data_bytes + 256);
+-    rfxrects = (struct rfx_rect *) (tiles + 512);
++    rfxrects = (struct rfx_rect *) (tiles + enc->num_crects);
+ 
+     count = enc->num_crects;
+     for (index = 0; index < count; index++)
diff --git a/debian/patches/series b/debian/patches/series
index 0b758a7..f0e195c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ kfreebsd.diff
 systemd.diff
 lfs.diff
 kb_jp.diff
+highres.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git