[pkg-remote-commits] [xrdp] 01/03: Update highres patch.

[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 4fc920b132d9fe3b4899efa45d9f48766964fdb9
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Feb 17 13:56:12 2017 +0100

    Update highres patch.
---
 debian/patches/highres.diff | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/patches/highres.diff b/debian/patches/highres.diff
index 04c2811..5e3a45d 100644
--- a/debian/patches/highres.diff
+++ b/debian/patches/highres.diff
@@ -9,16 +9,30 @@ 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
+@@ -22,6 +22,7 @@
+ #include "xrdp.h"
+ #include "thread_calls.h"
+ #include "fifo.h"
++#include "limits.h"
+ 
+ #ifdef XRDP_RFXCODEC
+ #include "rfxcodec_encode.h"
+@@ -320,21 +321,24 @@ 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;
++    out_data_bytes = 16 * 1024 * 1024;
++
++    if ((enc->num_crects > (INT_MAX / sizeof(struct rfx_tile))) ||
++        (enc->num_drects > (INT_MAX / sizeof(struct rfx_rect) -
++                            sizeof(struct rfx_tile) * enc->num_crects -
++                            256 - out_data_bytes))) {
+         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 +

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