summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-12-22 11:45:36 +0100
committerJulien Cristau <jcristau@debian.org>2011-01-10 15:16:45 +0100
commit5b979a13df331ad28ce7f1c90d6e059f6fd4eedb (patch)
treee09939f5d47d001a0b76eedf74fca7b45c85b701
parent561afd799fc4060111b650657f3a0a01cce484b3 (diff)
EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703).
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 . Signed-off-by: Michel Dänzer <daenzer@vmware.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit e06fa804009798ea95efa8babaabb0228dfdfe65)
-rw-r--r--exa/exa_accel.c2
-rw-r--r--exa/exa_unaccel.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index d4eae8960..76012d3dd 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1049,6 +1049,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/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 9bc765a53..fa8e791b5 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -525,6 +525,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
return pixel;
}
case 8:
+ case 4:
+ case 1:
{
CARD8 pixel;