xserver: Branch 'master'

[Peter Hutterer]

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

New commits:
diff-tree ac2356843e38b3400142bc54b65393c12976fc07 (from 1072b88a8f352484e70bc749e300c936e5600480)
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 f738419..5996b75 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -238,7 +238,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");