aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@users.noreply.github.com>2015-05-01 16:16:30 -0400
committerMike DePaulo <mikedep333@users.noreply.github.com>2015-05-01 16:16:30 -0400
commitc9d81fc38915faaffdbcfe4b4f69d5e2fcbfcedf (patch)
treef962041d8bb5b2bc956ecb673dd434c60aebbb95 /nx-X11
parent7ccbb073f83b7aa8d0f154b34693b1075e455bd8 (diff)
parentdba779d9f99ab2fc6bf05c78515dbdd82840cadd (diff)
downloadnx-libs-c9d81fc38915faaffdbcfe4b4f69d5e2fcbfcedf.tar.gz
nx-libs-c9d81fc38915faaffdbcfe4b4f69d5e2fcbfcedf.tar.bz2
nx-libs-c9d81fc38915faaffdbcfe4b4f69d5e2fcbfcedf.zip
Merge pull request #20 from sunweaver/pr/fix-CVE-2015-3418
dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418).
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/dix/dispatch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 5ad2f5af2..ab1064051 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -2071,7 +2071,7 @@ ProcPutImage(register ClientPtr client)
tmpImage = (char *)&stuff[1];
lengthProto = length;
- if (lengthProto >= (INT32_MAX / stuff->height))
+ if (stuff->height != 0 && lengthProto >= (INT32_MAX / stuff->height))
return BadLength;
if (((((lengthProto * stuff->height) + (unsigned)3) >> 2) +