vcxsrv/libXfont/src/bitmap, branch 1.15.2.5

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

2015-03-28T17:06:17+00:00

We use 32-bit ints to read from the bdf file, but then try to stick into a 16-bit int in the xCharInfo struct, so make sure they won't overflow that range. Found by afl-1.24b. v2: Verify that additions won't overflow 32-bit int range either. v3: As Julien correctly observes, the previous check for bh & bw not being < 0 reduces the number of cases we need to check for overflow. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau (cherry picked from commit 2351c83a77a478b49cba6beb2ad386835e264744)

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

2015-03-28T17:06:06+00:00

Previously would charge on ahead with a NULL pointer in ci->bits, and then crash later in FontCharInkMetrics() trying to access the bits. Found with afl-1.23b. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau (cherry picked from commit 78c2e3d70d29698244f70164428bd2868c0ab34c)

bdfReadProperties: property count needs range check [CVE-2015-1802]

2015-03-28T17:05:57+00:00

Avoid integer overflow or underflow when allocating memory arrays by multiplying the number of properties reported for a BDF font. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau (cherry picked from commit 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e)

Merge remote-tracking branch 'origin/released'

2014-03-28T16:43:20+00:00

Conflicts: X11/xtrans/Xtrans.c

Update following packages:

2014-03-28T16:32:23+00:00

libXfont-1.4.7 xproto-7.0.25

Merge remote-tracking branch 'origin/released'

2013-10-01T10:33:20+00:00

* origin/released: Update following packages: Conflicts: X11/Xwinsock.h apps/xhost/xhost.c libXaw/src/Vendor.c libXfont/include/X11/fonts/bdfint.h libXfont/src/fontfile/catalogue.c

Update following packages:

2013-10-01T10:28:08+00:00

libXpm-3.5.11 libXaw-1.0.12 libXfont-1.4.6 libXrender-0.9.8 xproto-7.0.24 inputproto-2.3 xclock-1.0.7 xhost-1.0.6

Merge remote-tracking branch 'origin/released'

2012-03-05T09:23:14+00:00

libfontenc xserver pixman mesa git update 5 Mar 2012

2012-03-05T08:59:38+00:00

font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2

Synchronised line endinge with release branch

2011-09-12T09:27:51+00:00