[X2Go-Commits] [nx-libs] 100/108: XKB: Fix size_syms calculation bug

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit 824b629732ed90e6040790eb07fe8271d5fb8fb3
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Jul 25 22:39:17 2018 +0200

    XKB: Fix size_syms calculation bug
    
    Backported from Xorg:
    
      commit f292de2ef13dc994a38029cee9e2642576893332
      Author: Daniel Stone <daniel at fooishbar.org>
      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 <uli42 at gmx.de>
---
 nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
index 100e827..178d415 100644
--- a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
+++ b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
@@ -396,7 +396,7 @@ KeyCode		matchingKeys[XkbMaxKeyCount],nMatchingKeys;
 	}
 	if (nResize>0) {
 	    int nextMatch;
-	    xkb->map->size_syms= (nTotal*12)/10;
+	    xkb->map->size_syms= (nTotal*15)/10;
 	    newSyms = _XkbTypedCalloc(xkb->map->size_syms,KeySym);
 	    if (newSyms==NULL)
 		return BadAlloc;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git