[Pkg-remote-team] [xrdp] 02/05: Reintroduce misc fixes.

[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 f484ca8ec1d13ce7e246b1ac2e68d8af578d4d89
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Nov 26 12:48:35 2016 +0100

    Reintroduce misc fixes.
---
 debian/patches/misc-fixes.diff | 43 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/misc-fixes.diff b/debian/patches/misc-fixes.diff
new file mode 100644
index 0000000..19f365b
--- /dev/null
+++ b/debian/patches/misc-fixes.diff
@@ -0,0 +1,43 @@
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: misc. fixes
+Forwarded: https://github.com/neutrinolabs/xorgxrdp/pull/17
+ https://github.com/neutrinolabs/xrdp/pull/467
+--- a/xorgxrdp/xrdpkeyb/rdpKeyboard.c
++++ b/xorgxrdp/xrdpkeyb/rdpKeyboard.c
+@@ -534,7 +534,7 @@ rdpInputKeyboard(rdpPtr dev, int msg, lo
+ }
+ 
+ /******************************************************************************/
+-void
++int
+ rdpkeybDeviceInit(DeviceIntPtr pDevice, KeySymsPtr pKeySyms, CARD8 *pModMap)
+ {
+     int i;
+@@ -565,7 +565,7 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
+     if (pKeySyms->map == 0)
+     {
+         LLOGLN(0, ("rdpkeybDeviceInit: out of memory"));
+-        exit(1);
++        return 1;
+     }
+     else
+     {
+@@ -581,6 +581,8 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
+     {
+         pKeySyms->map[i] = g_kbdMap[i];
+     }
++
++    return 0;
+ }
+ 
+ /******************************************************************************/
+@@ -676,7 +678,8 @@ rdpkeybControl(DeviceIntPtr device, int
+     switch (what)
+     {
+         case DEVICE_INIT:
+-            rdpkeybDeviceInit(device, &keySyms, modMap);
++            if (rdpkeybDeviceInit(device, &keySyms, modMap))
++                return BadAlloc;
+             memset(&set, 0, sizeof(set));
+             set.rules = g_base_str;
+             set.model = g_pc104_str;
diff --git a/debian/patches/series b/debian/patches/series
index abb8721..2e874e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 make-fixes.diff
 config.diff
+misc-fixes.diff
 systemd.diff
 nxstack.diff
 fix_perms.diff

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