xserver: Branch 'server-1.16-branch'

[Julien Cristau]

 dix/dispatch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f39ac527baab8a38d023e3a8416757ccfcead42a
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Jan 3 08:46:45 2015 -0800

    dix: Allow zero-height PutImage requests
    
    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 at keithp.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit dc777c346d5d452a53b13b917c45f6a1bad2f20b)
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 01820bc..4e24e62 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1956,7 +1956,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) +