vcxsrv, branch release/external-1.15.2.x

Update openssl: 1.0.1o -> 1.0.1p

2015-07-10T12:13:00+00:00

Update openssl: 1.0.1m -> 1.0.1o

2015-07-07T12:57:00+00:00

Update changelog about openssl update to 1.0.1m

2015-03-28T14:57:45+00:00

Update openssl to version openssl-1.0.1m

2015-03-28T13:50:31+00:00

Update packages.txt about libXfont 1.4.9

2015-03-28T13:17:20+00:00

libXfont 1.4.9

2015-03-28T13:15:34+00:00

Signed-off-by: Alan Coopersmith

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

2015-03-28T13:15:33+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-28T13:15:32+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-28T13:15:32+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)

Set close-on-exec for font file I/O.

2015-03-28T13:15:31+00:00

Reviewed-by: Alan Coopersmith Signed-off-by: Thomas Klausner (cherry picked from commit d9fda3d247942292a5f24694c22337c547006e11)