Bug#629611: xserver-xorg: reproducible X server segfault

[Michel Dänzer <daenzer@debian.org>]

On Sam, 2011-11-05 at 01:23 +0100, Julien Cristau wrote: 
> 
> Michel, would this make sense, to avoid calling CopyArea for an XYBitMap
> image?
> 
> diff --git a/Xext/shm.c b/Xext/shm.c
> index a6f804c..223935e 100644
> --- a/Xext/shm.c
> +++ b/Xext/shm.c
> @@ -498,7 +498,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
>  {
>      PixmapPtr pPixmap;
>  
> -    if (format == ZPixmap || depth == 1) {
> +    if (format == ZPixmap || (format == XYPixmap && depth == 1)) {
>         pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
>                                          BitsPerPixel(depth),
>                                          PixmapBytePad(w, depth),

Looks good, but then I was the one who got it wrong last time. :} I'd
run it past xorg-devel.


-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer