[src/netbsd-6-1]: src/doc ticket 945

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/82f43e9b0a80
branches:  netbsd-6-1
changeset: 775846:82f43e9b0a80
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Sep 18 19:54:30 2013 +0000

description:
ticket 945

diffstat:

 doc/CHANGES-6.1.2 |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 6607b6d5c559 -r 82f43e9b0a80 doc/CHANGES-6.1.2
--- a/doc/CHANGES-6.1.2 Wed Sep 18 03:25:15 2013 +0000
+++ b/doc/CHANGES-6.1.2 Wed Sep 18 19:54:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.2,v 1.1.2.7 2013/09/18 03:25:15 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.2,v 1.1.2.8 2013/09/18 19:54:30 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2
 release:
@@ -76,3 +76,12 @@
        Include BRDADDR and NETMASK to the v4 ioctls we ban for v6; from
        FreeBSD.
        [spz, ticket #944]
+xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c       patch
+xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c      patch
+
+       The size of the arrays is max_key_code + 1. This makes these functions
+       consistent with the other checks added for CVE-2013-1997.
+       Check the XkbGetNames reply when names->keys was just allocated
+       Should fix PR lib/48170.
+       [riz, ticket #945]
+