[src/netbsd-6-1]: src/doc Ticket #966.

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

details:   https://anonhg.NetBSD.org/src/rev/44c397c0076a
branches:  netbsd-6-1
changeset: 775873:44c397c0076a
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sat Oct 12 19:00:10 2013 +0000

description:
Ticket #966.

diffstat:

 doc/CHANGES-6.1.3 |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 277d60e0cfed -r 44c397c0076a doc/CHANGES-6.1.3
--- a/doc/CHANGES-6.1.3 Sat Oct 12 18:53:47 2013 +0000
+++ b/doc/CHANGES-6.1.3 Sat Oct 12 19:00:10 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.3,v 1.1.2.1 2013/10/12 18:53:47 jdc Exp $
+# $NetBSD: CHANGES-6.1.3,v 1.1.2.2 2013/10/12 19:00:10 jdc Exp $
 
 A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2
 release:
@@ -10,3 +10,14 @@
        Welcome to 6.1.2_PATCH.
        [jdc]
 
+xsrc/external/mit/xorg-server/dist/dix/dixfonts.c      1.2
+xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c          1.4
+
+       Fix CVE-2013-4396 using a patch from Alan Coopersmith:
+       Save a pointer to the passed in closure structure before copying it
+       and overwriting the *c pointer to point to our copy instead of the
+       original.  If we hit an error, once we free(c), reset c to point to
+       the original structure before jumping to the cleanup code that
+       references *c.
+       [spz, ticket #966]
+