libX11: Changes to 'master'

[Julien Cristau]

 src/xkb/XKBGetMap.c |    2 +-
 src/xkb/XKBNames.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3bdd2b090915fe0163b062f0e6576fe05dd332e
Author: Julien Cristau <jcristau at debian.org>
Date:   Thu May 23 20:39:46 2013 +0200

    xkb: fix off-by-one in _XkbReadGetNamesReply and _XkbReadVirtualModMap
    
    The size of the arrays is max_key_code + 1.  This makes these functions
    consistent with the other checks added for CVE-2013-1997.
    
    Also check the XkbGetNames reply when names->keys was just allocated.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Tested-by: Colin Walters <walters at verbum.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>