From 55ce9abe5a78acfe9dc946f585aef9ab86be510c Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Mon, 31 Jan 2011 21:10:07 +0000 Subject: Apply fix from upstream: commit e06fa804009798ea95efa8babaabb0228dfdfe65 EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703). Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 Reported by Barry Grumbine on ports@ ok matthieu@ --- xserver/exa/exa_accel.c | 2 ++ xserver/exa/exa_unaccel.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xserver/exa/exa_accel.c b/xserver/exa/exa_accel.c index 6c677c7a1..b4c0f8351 100644 --- a/xserver/exa/exa_accel.c +++ b/xserver/exa/exa_accel.c @@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, *(CARD16*)pExaPixmap->sys_ptr = pixel; break; case 8: + case 4: + case 1: *(CARD8*)pExaPixmap->sys_ptr = pixel; } diff --git a/xserver/exa/exa_unaccel.c b/xserver/exa/exa_unaccel.c index a078cc114..d3c405fb1 100644 --- a/xserver/exa/exa_unaccel.c +++ b/xserver/exa/exa_unaccel.c @@ -748,6 +748,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) return pixel; } case 8: + case 4: + case 1: { CARD8 pixel; -- cgit v1.2.3