Attachment #543675 for bug #824294

View | Details | Raw Unified | Return to bug 824294
Collapse All | Expand All

Lines 426-432 XkbServerMapPtr srv; Link Here

(-)a/src/xkb/XKBGetMap.c (-1 / +1 lines)
426		426
427	if ( rep->totalVModMapKeys>0 ) {	427	if ( rep->totalVModMapKeys>0 ) {
428	if (((int) rep->firstVModMapKey + rep->nVModMapKeys)	428	if (((int) rep->firstVModMapKey + rep->nVModMapKeys)
429	> xkb->max_key_code)	429	> xkb->max_key_code + 1)
430	return BadLength;	430	return BadLength;
431	if (((xkb->server==NULL)\|\|(xkb->server->vmodmap==NULL))&&	431	if (((xkb->server==NULL)\|\|(xkb->server->vmodmap==NULL))&&
432	(XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) {	432	(XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) {

Lines 180-186 _XkbReadGetNamesReply( Display * dpy, Link Here

(-)a/src/xkb/XKBNames.c (-2 / +1 lines)
180	nKeys= xkb->max_key_code+1;	180	nKeys= xkb->max_key_code+1;
181	names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec);	181	names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec);
182	}	182	}
183	else if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code)	183	if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code + 1)
184	goto BAILOUT;	184	goto BAILOUT;
185	if (names->keys!=NULL) {	185	if (names->keys!=NULL) {
186	if (!_XkbCopyFromReadBuffer(&buf,	186	if (!_XkbCopyFromReadBuffer(&buf,
187	-

Return to bug 824294