Add a couple fixups for the security patches

    - off-by-one in xkb
    - memory leak in an error path

Backport from debian to NX: Ulrich Sibiller <uli42@gmx.de>