xserver: Branch 'mpx'

[Peter Hutterer]

 dix/devices.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree e54311395e1e7ae458c8ce59da0914706c4a04f6 (from f8cd19bd1692d12a6047c088a626a6ae715d469d)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Sun Mar 25 09:41:33 2007 +0930

    dix:    Increase allocation size for core keyboard keymap to avoid buffer
            overrun when copying keymap from extension devices.

diff --git a/dix/devices.c b/dix/devices.c
index 579203f..10843d4 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -259,7 +259,7 @@ CoreKeyboardProc(DeviceIntPtr pDev, int 
         keySyms.mapWidth = 4;
         keySyms.map = (KeySym *)xcalloc(sizeof(KeySym),
                                         (keySyms.maxKeyCode -
-                                         keySyms.minKeyCode) *
+                                         keySyms.minKeyCode + 1) *
                                         keySyms.mapWidth);
         if (!keySyms.map) {
             ErrorF("Couldn't allocate core keymap\n");