aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/XKBGetMap.c
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2013-05-21 21:54:55 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-12 09:34:39 +0200
commita9f623f0a63372ca0705e8394fadf514dec55b1c (patch)
tree478aa88a8c42cbcb8221dd6680a16131556b49be /nx-X11/lib/X11/XKBGetMap.c
parent838108c296cb739350456f49431b57821c78b15c (diff)
downloadnx-libs-a9f623f0a63372ca0705e8394fadf514dec55b1c.tar.gz
nx-libs-a9f623f0a63372ca0705e8394fadf514dec55b1c.tar.bz2
nx-libs-a9f623f0a63372ca0705e8394fadf514dec55b1c.zip
Add a couple fixups for the security patches
Add a couple fixups for the security patches - off-by-one in xkb - memory leak in an error path Backport from debian to NX: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/XKBGetMap.c')
-rw-r--r--nx-X11/lib/X11/XKBGetMap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/X11/XKBGetMap.c
index 5eb1d41bf..391d7aa89 100644
--- a/nx-X11/lib/X11/XKBGetMap.c
+++ b/nx-X11/lib/X11/XKBGetMap.c
@@ -427,7 +427,7 @@ XkbServerMapPtr srv;
if ( rep->totalVModMapKeys>0 ) {
if (((int) rep->firstVModMapKey + rep->nVModMapKeys)
- > xkb->max_key_code)
+ > xkb->max_key_code + 1)
return BadLength;
if (((xkb->server==NULL)||(xkb->server->vmodmap==NULL))&&
(XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) {