Skip to content

N
nx-libs
Commit 78ed2333 authored by Julien Cristau's avatar Julien Cristau Committed by Ulrich Sibiller
Browse files
Options

xkb: fix off-by-one in _XkbReadGetNamesReply and _XkbReadVirtualModMap

The size of the arrays is max_key_code + 1. This makes these functions consistent with the other checks added for CVE-2013-1997. Also check the XkbGetNames reply when names->keys was just allocated. Signed-off-by: 's avatarJulien Cristau <jcristau@debian.org> Tested-by: 's avatarColin Walters <walters@verbum.org> Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 082e8313
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
nx-X11/lib/X11/XKBGetMap.c
View file @ 78ed2333
......@@ -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)) {
......
nx-X11/lib/X11/XKBNames.c
View file @ 78ed2333
......@@ -180,7 +180,7 @@ _XkbReadGetNamesReply( Display * dpy,
nKeys= xkb->max_key_code+1;
names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec);
}
else if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code)
if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code + 1)
goto BAILOUT;
if (names->keys!=NULL) {
if (!_XkbCopyFromReadBuffer(&buf,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment