diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-02-11 20:58:48 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-02-11 20:58:48 +0000 |
| commit | 61c5fcfe608b38a9ce64b1db6393c392108cc89d (patch) | |
| tree | 8ef036e5b54b6717be9c50782761a67170b6042d /xserver/dix/dispatch.c | |
| parent | 4506119f5eb47a09843e68ff91de6ce5c63d0ba0 (diff) | |
Update to xserver 1.16.4.
Contains fix for CVE-2015-0255. ok dcoppa@
Diffstat (limited to 'xserver/dix/dispatch.c')
| -rw-r--r-- | xserver/dix/dispatch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/dix/dispatch.c b/xserver/dix/dispatch.c index 01820bc0f..4e24e627f 100644 --- a/xserver/dix/dispatch.c +++ b/xserver/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) + |