Module Name: src
Committed By: bouyer
Date: Wed Sep 18 19:54:30 UTC 2013
Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.2
Log Message:
ticket 945
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-6.1.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-6.1.2
diff -u src/doc/CHANGES-6.1.2:1.1.2.7 src/doc/CHANGES-6.1.2:1.1.2.8
--- src/doc/CHANGES-6.1.2:1.1.2.7 Wed Sep 18 03:25:15 2013
+++ src/doc/CHANGES-6.1.2 Wed Sep 18 19:54:30 2013
@@ -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 @@ sys/netinet6/in6.c 1.167 via patch
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]
+
