diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-01-31 21:10:07 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-01-31 21:10:07 +0000 |
| commit | 55ce9abe5a78acfe9dc946f585aef9ab86be510c (patch) | |
| tree | 9945e5de4e3496bb617aca76818c71d05c882816 | |
| parent | 524ee7313521d6d43b1cf512dbde6252c4616373 (diff) | |
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@
| -rw-r--r-- | xserver/exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | xserver/exa/exa_unaccel.c | 2 |
2 files changed, 4 insertions, 0 deletions
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; |