File U_dix-Allow-zero-height-PutImage-requests.patch of Package xorg-x11-server.1461

Overview Repositories Revisions Requests Users Attributes Meta

File U_dix-Allow-zero-height-PutImage-requests.patch of Package xorg-x11-server.1461

From: Keith Packard <keithp@keithp.com>
Date: Sat Jan 3 08:46:45 2015 -0800
Subject: [PATCH]dix: Allow zero-height PutImage requests
Patch-mainline: Upstream
Git-commit: dc777c346d5d452a53b13b917c45f6a1bad2f20b
Git-repo: git://anongit.freedesktop.org/git/xorg/xserver
References: bnc#928520
Signed-off-by: Egbert Eich <eich@suse.com>

The length checking code validates PutImage height and byte width by
making sure that byte-width >= INT32_MAX / height. If height is zero,
this generates a divide by zero exception. Allow zero height requests
explicitly, bypassing the INT32_MAX check.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 dix/dispatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 55b978d..9044ac7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2000,7 +2000,7 @@ ProcPutImage(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 ((bytes_to_int32(lengthProto * stuff->height) +

Places

File U_dix-Allow-zero-height-PutImage-requests.patch of Package xorg-x11-server.1461

Places