frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #6428: Fix off-by-one error when walking off the end of the vmodmap 

list.
This commit is contained in:
Daniel Stone 2006-04-01 21:49:44 +00:00
parent 1e764feab5
commit 5c0a2088e2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,10 @@
(To those wondering about the date: Yes, this is me doing an Xprint (To those wondering about the date: Yes, this is me doing an Xprint
commit, but it fixes the --disable-xprint path, so.) commit, but it fixes the --disable-xprint path, so.)
* xkb/xkb.c: (XkbSizeVirtualModMap):
Bug #6428: Fix off-by-one error when walking off the end of the
vmodmap list.
2006-03-31 Eric Anholt <anholt@FreeBSD.org> 2006-03-31 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_unaccel.c: (ExaCheckComposite): * exa/exa_unaccel.c: (ExaCheckComposite):

2
xkb/xkb.c
View File

@ -1255,7 +1255,7 @@ XkbSizeVirtualModMap(XkbDescPtr xkb,xkbGetMapReply *rep)
rep->totalVModMapKeys= 0; rep->totalVModMapKeys= 0;
return 0; return 0;
} }
for (nRtrn=i=0;i<rep->nVModMapKeys;i++) { for (nRtrn=i=0;i<rep->nVModMapKeys-1;i++) {
if (xkb->server->vmodmap[i+rep->firstVModMapKey]!=0) if (xkb->server->vmodmap[i+rep->firstVModMapKey]!=0)
nRtrn++; nRtrn++;
} }