diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-12-22 11:45:36 +0100 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-01-11 11:15:17 -0800 |
| commit | 205efedddc3e966633d63d2d7907148a34bc67f6 (patch) | |
| tree | 72aa86732178395ac6c82780b4389ee23bca11b9 | |
| parent | 2fe16061231dc995731b5f3c1cc69dc5d53b1145 (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.c | 2 | ||||
| -rw-r--r-- | exa/exa_unaccel.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 57029fdc5..3b71ad412 100644 --- a/exa/exa_accel.c +++ b/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/exa/exa_unaccel.c b/exa/exa_unaccel.c index 8d7009813..1f91f193d 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -736,6 +736,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) return pixel; } case 8: + case 4: + case 1: { CARD8 pixel; |