---
- branch: netbsd-5-1
  date: Sun Oct 13 07:25:06 UTC 2013
  files:
  - new: 1.1.1.1.2.1.2.1
    old: 1.1.1.1.2.1
    path: xsrc/external/mit/xorg-server/dist/dix/dixfonts.c
    pathrev: xsrc/external/mit/xorg-server/dist/dix/dixfonts.c@1.1.1.1.2.1.2.1
    type: modified
  - new: 1.2.12.1
    old: '1.2'
    path: xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c
    pathrev: xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c@1.2.12.1
    type: modified
  id: 20131013T072506Z.f8a51cb46ef60e1fa70b87e10319a319189e4648
  log: |
    Pull up revisions:
      xsrc/external/mit/xorg-server/dist/dix/dixfonts.c revision 1.2 via patch
      xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c revision 1.4 via patch
    (requested by spz in ticket #1884).

    Fix CVE-2013-4396 using a patch from:

    --- snip ---
    >From a4d9bf1259ad28f54b6d59a480b2009cc89ca623 Mon Sep 17 00:00:00 2001
    From: Alan Coopersmith <alan.coopersmith@oracle.com>
    Date: Mon, 16 Sep 2013 21:47:16 -0700
    Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText()

    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.

    Since one of the errors being checked for is whether the server was
    able to malloc(c->nChars * itemSize), the client can potentially pass
    a number of characters chosen to cause the malloc to fail and the
    error path to be taken, resulting in the read from freed memory.

    Since the memory is accessed almost immediately afterwards, and the
    X server is mostly single threaded, the odds of the free memory having
    invalid contents are low with most malloc implementations when not using
    memory debugging features, but some allocators will definitely overwrite
    the memory there, leading to a likely crash.

    Reported-by: Pedro Ribeiro <pedrib@gmail.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
  module: xsrc
  subject: 'CVS commit: [netbsd-5-1] xsrc'
  unixtime: '1381649106'
  user: jdc