Reintroduce misc fixes.
Dominik George
7 years ago
| 0 | From: Thorsten Glaser <tg@mirbsd.org> | |
| 1 | Subject: misc. fixes | |
| 2 | Forwarded: https://github.com/neutrinolabs/xorgxrdp/pull/17 | |
| 3 | https://github.com/neutrinolabs/xrdp/pull/467 | |
| 4 | --- a/xorgxrdp/xrdpkeyb/rdpKeyboard.c | |
| 5 | +++ b/xorgxrdp/xrdpkeyb/rdpKeyboard.c | |
| 6 | @@ -534,7 +534,7 @@ rdpInputKeyboard(rdpPtr dev, int msg, lo | |
| 7 | } | |
| 8 | ||
| 9 | /******************************************************************************/ | |
| 10 | -void | |
| 11 | +int | |
| 12 | rdpkeybDeviceInit(DeviceIntPtr pDevice, KeySymsPtr pKeySyms, CARD8 *pModMap) | |
| 13 | { | |
| 14 | int i; | |
| 15 | @@ -565,7 +565,7 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice, | |
| 16 | if (pKeySyms->map == 0) | |
| 17 | { | |
| 18 | LLOGLN(0, ("rdpkeybDeviceInit: out of memory")); | |
| 19 | - exit(1); | |
| 20 | + return 1; | |
| 21 | } | |
| 22 | else | |
| 23 | { | |
| 24 | @@ -581,6 +581,8 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice, | |
| 25 | { | |
| 26 | pKeySyms->map[i] = g_kbdMap[i]; | |
| 27 | } | |
| 28 | + | |
| 29 | + return 0; | |
| 30 | } | |
| 31 | ||
| 32 | /******************************************************************************/ | |
| 33 | @@ -676,7 +678,8 @@ rdpkeybControl(DeviceIntPtr device, int | |
| 34 | switch (what) | |
| 35 | { | |
| 36 | case DEVICE_INIT: | |
| 37 | - rdpkeybDeviceInit(device, &keySyms, modMap); | |
| 38 | + if (rdpkeybDeviceInit(device, &keySyms, modMap)) | |
| 39 | + return BadAlloc; | |
| 40 | memset(&set, 0, sizeof(set)); | |
| 41 | set.rules = g_base_str; | |
| 42 | set.model = g_pc104_str; |