Bug #6428: Fix off-by-one error when walking off the end of the vmodmap
list.
This commit is contained in:
parent
1e764feab5
commit
5c0a2088e2
|
@ -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):
|
||||||
|
|
|
@ -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++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user