aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/XKBMisc.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:33:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:33:02 +0100
commitfccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (patch)
tree2afaa1a03cf49ef01796a4013513f01bdaf58eca /nx-X11/programs/Xserver/xkb/XKBMisc.c
parent122db3fde2b934df206567abc0c8b431962ce4b3 (diff)
parent3965f24befb21f469b887d4c69b9defc861831fb (diff)
downloadnx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.gz
nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.bz2
nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.zip
Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x
Attributes GH PR #717: https://github.com/ArcticaProject/nx-libs/pull/717
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/XKBMisc.c')
-rw-r--r--nx-X11/programs/Xserver/xkb/XKBMisc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/XKBMisc.c b/nx-X11/programs/Xserver/xkb/XKBMisc.c
index 98f11a2be..2c5cf42c7 100644
--- a/nx-X11/programs/Xserver/xkb/XKBMisc.c
+++ b/nx-X11/programs/Xserver/xkb/XKBMisc.c
@@ -366,8 +366,11 @@ unsigned changed,tmp;
unsigned int new_vmodmask;
changed|= XkbKeyActionsMask;
pActs= XkbResizeKeyActions(xkb,key,nSyms);
- if (!pActs)
+ if (!pActs) {
+ if (nSyms > IBUF_SIZE)
+ free(interps);
return False;
+ }
new_vmodmask= 0;
for (n=0;n<nSyms;n++) {
if (interps[n]) {
@@ -470,7 +473,7 @@ register int i;
int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
if ((!xkb) || (!XkbKeycodeInRange(xkb,key)) || (!xkb->map) ||
- (!xkb->map->types)||((groups&XkbAllGroupsMask)==0)||
+ (!xkb->map->types)||(!newTypesIn)||((groups&XkbAllGroupsMask)==0)||
(nGroups>XkbNumKbdGroups)) {
return BadMatch;
}