CVS commit: [netbsd-5-2] xsrc

["Soren Jacobsen" <snj%netbsd.org@localhost>]

Module Name:    xsrc
Committed By:   snj
Date:           Tue Mar 17 18:44:15 UTC 2015

Modified Files:
        xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-5-2]: bdfread.c
        xsrc/xfree/xc/lib/font/bitmap [netbsd-5-2]: bdfread.c

Log Message:
Apply patch (requested by mrg in ticket #1953):
Fix the following security issues:
CVE-2015-1802: bdfReadProperties: property count needs range check

    The bdf parser reads a count for the number of properties defined in
    a font from the font file, and allocates arrays with entries for each
    property based on that count.  It never checked to see if that count
    was negative, or large enough to overflow when multiplied by the size
    of the structures being allocated, and could thus allocate the wrong
    buffer size, leading to out of bounds writes.

CVE-2015-1803: bdfReadCharacters: bailout if a char's bitmap cannot be read

    If the bdf parser failed to parse the data for the bitmap for any
    character, it would proceed with an invalid pointer to the bitmap
    data and later crash when trying to read the bitmap from that pointer.

CVE-2015-1804: bdfReadCharacters: ensure metrics fit into xCharInfo struct

    The bdf parser read metrics values as 32-bit integers, but stored
    them into 16-bit integers.  Overflows could occur in various operations


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1.4.1 -r1.1.1.1.2.1.4.2 \
    xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
cvs rdiff -u -r1.2.12.1 -r1.2.12.2 xsrc/xfree/xc/lib/font/bitmap/bdfread.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.