CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src/xkb

[Soren Jacobsen]

Module Name:    xsrc
Committed By:   snj
Date:           Thu Jul 23 17:43:41 UTC 2015

Modified Files:
        xsrc/external/mit/libX11/dist/src/xkb [netbsd-7]: XKBMAlloc.c

Log Message:
Apply patch (requested by mrg in ticket #885):
Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1)
that was attempted locally in revision 1.2: Ensure we allocate at least
XkbNumRequiredTypes in map.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
    xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2.2.1
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2	Sun Jul 13 16:37:45 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c	Thu Jul 23 17:43:41 2015
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
             }
         }
     }
-    if ((!map) || (!map->types) || !(map->num_types < XkbNumRequiredTypes)) {
+    if ((!map) || (!map->types) || (map->num_types < XkbNumRequiredTypes)) {
         tmp = XkbNumRequiredTypes + 1;
         if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
             return NULL;