nx-libs/nx-X11/programs/Xserver/xkb, branch 3.5.99.17

Convert existing Xprintf style calls to asprintf style

2018-11-09T14:31:57+00:00

This commit + some more adaption in ddxLoad.c which where no longer present when Alan did the patch. However, our code still has them: Author: Alan Coopersmith Date: Sat Nov 27 20:09:04 2010 -0800 Convert existing Xprintf style calls to asprintf style Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston Reviewed-by: Mikhail Gusarov Backported-to-NX-by: Ulrich Sibiller

xkb: Don't check for NULL before calling free

2018-11-09T14:31:57+00:00

Author: Pauli Nieminen Date: Thu Jul 22 11:34:54 2010 +0300 xkb: Don't check for NULL before calling free Signed-off-by: Pauli Nieminen Reviewed-by: Peter Hutterer Backported-to-NX-by: Ulrich Sibiller

xkb: Fix memory leak if opening file fails

2018-11-09T14:31:57+00:00

Author: Pauli Nieminen Date: Thu Jul 22 11:33:33 2010 +0300 xkb: Fix memory leak if opening file fails If fopen fails pointer in buf would be overwriten with a new pointer. Signed-off-by: Pauli Nieminen Reviewed-by: Peter Hutterer Backported-to-NX-by: Ulrich Sibiller

Make: Automatically determine xkb dir

2018-11-09T14:31:57+00:00

XKB: Fix size_syms calculation bug

2018-11-09T14:31:57+00:00

Backported from Xorg: commit f292de2ef13dc994a38029cee9e2642576893332 Author: Daniel Stone Date: Wed Mar 21 02:04:12 2007 +0200 XKB: Fix size_syms calculation bug Apparently it needed to be nSyms*15/10, not *12/10; make it match the other allocation code. Backported-to-nx-by: Ulrich Sibiller

XKB: Remove unused DDX functions

2018-11-09T14:31:57+00:00

commit 7c4c00649cae855e141ec9a3667bfe399e3156d0 Author: Daniel Stone Date: Thu Jan 1 05:25:52 2009 +1100 XKB: Remove unused DDX functions They were complete no-ops anyway. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller

XKB: Fix logic error

2018-11-09T14:31:57+00:00

commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7 Author: Daniel Stone Date: Sat Jan 17 13:42:46 2009 +0200 XKB: Fix logic error Use logical or instead of bitwise or. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller

XKB: Fix garbage initialization

2018-11-09T14:31:57+00:00

commit 8311cd5f89ca6781842bb24671b8122cdf8be148 Author: Jeremy Huddleston Date: Tue Mar 23 10:37:36 2010 -0700 XKB: Fix garbage initialization XkbEnableDisableControls set extra garbage bits on the xkbControlsNotify changedControls mask because it was uninitialized on the stack. Found by clang Signed-off-by: Jeremy Huddleston Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller

ProcXkbGetKbdByName: fix use of uninitialised bytes valgrind error.

2018-11-09T14:31:57+00:00

We have fixed that (independendly) before, but missed one line. Backported-to-nx-by: Ulrich Sibiller commit 85f9017393c9bb19553e9afcf554673a44a09993 Author: Ander Conselvan de Oliveira Date: Tue Feb 8 11:10:10 2011 +0200 ProcXkbGetXkbByName: fix use of uninitialised bytes valgrind error. ==9999== Syscall param writev(vector[...]) points to uninitialised byte(s) ==9999== at 0x4AB5154: writev (writev.c:51) ==9999== by 0x7C7C3: _XSERVTransWritev (Xtrans.c:912) ==9999== by 0x61C8B: FlushClient (io.c:924) ==9999== by 0x62423: WriteToClient (io.c:846) ==9999== by 0xCE39B: XkbSendMap (xkb.c:1408) ==9999== by 0xD247B: ProcXkbGetKbdByName (xkb.c:5814) ==9999== by 0x4AB53: Dispatch (dispatch.c:432) ==9999== by 0x205BF: main (main.c:291) ==9999== Address 0x557eb68 is 40 bytes inside a block of size 4,096 alloc'd ==9999== at 0x48334A4: calloc (vg_replace_malloc.c:467) ==9999== by 0x62567: WriteToClient (io.c:1065) ==9999== by 0x452EB: ProcEstablishConnection (dispatch.c:3685) ==9999== by 0x4AB53: Dispatch (dispatch.c:432) ==9999== by 0x205BF: main (main.c:291) ==9999== Uninitialised value was created by a stack allocation ==9999== at 0xD1910: ProcXkbGetKbdByName (xkb.c:5559) Signed-off-by: Peter Hutterer Reviewed-by: Oliver McFadden Signed-off-by: Ander Conselvan de Oliveira

XkbSendNames: fix use of uninitialised bytes valgrind error.

2018-11-09T14:31:57+00:00

Backported-to-nx-by: Ulrich Sibiller commit 8a34d7a8532c7ca013e67307f3baf200167abb92 Author: Ander Conselvan de Oliveira Date: Tue Feb 8 11:10:11 2011 +0200 XkbSendNames: fix use of uninitialised bytes valgrind error. ==537== Syscall param writev(vector[...]) points to uninitialised byte(s) ==537== at 0x4AB7154: writev (writev.c:51) ==537== by 0x8935B: _XSERVTransWritev (Xtrans.c:912) ==537== by 0x6C55F: FlushClient (io.c:924) ==537== by 0x6CCF3: WriteToClient (io.c:846) ==537== by 0xD51D3: XkbSendNames (xkb.c:3765) ==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825) ==537== by 0x27B7B: Dispatch (dispatch.c:432) ==537== by 0x205B7: main (main.c:291) ==537== Address 0x55899f2 is 154 bytes inside a block of size 1,896 alloc'd ==537== at 0x4834C48: malloc (vg_replace_malloc.c:236) ==537== by 0xD47AF: XkbSendNames (xkb.c:3642) ==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825) ==537== by 0x27B7B: Dispatch (dispatch.c:432) ==537== by 0x205B7: main (main.c:291) ==537== Uninitialised value was created by a heap allocation ==537== at 0x4834C48: malloc (vg_replace_malloc.c:236) ==537== by 0xD47AF: XkbSendNames (xkb.c:3642) ==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825) ==537== by 0x27B7B: Dispatch (dispatch.c:432) ==537== by 0x205B7: main (main.c:291) Signed-off-by: Peter Hutterer Reviewed-by: Oliver McFadden Signed-off-by: Ander Conselvan de Oliveira