frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #6867: Yet another Render crash fix. (Michel Dänzer)

This commit is contained in:
Adam Jackson 2006-05-09 22:36:01 +00:00
parent 24310f827b
commit ab1a0249ba
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-05-09 Adam Jackson <ajax@freedesktop.org>
* render/render.c:
Bug #6867: Yet another Render crash fix. (Michel Dänzer)
2006-05-09 Adam Jackson <ajax@freedesktop.org> 2006-05-09 Adam Jackson <ajax@freedesktop.org>
* configure.ac: * configure.ac:

4
render/render.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/render/render.c,v 1.12 2005/08/28 19:47:39 ajax Exp $ */ /* $XdotOrg: xserver/xorg/render/render.c,v 1.13 2006/02/10 22:00:30 anholt Exp $ */
/* /*
* $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $
* *
@ -747,7 +747,7 @@ ProcRenderComposite (ClientPtr client)
VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess,
RenderErrBase + BadPicture); RenderErrBase + BadPicture);
if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) ||
(pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen)) (pMask && pMask->pDrawable && pDst->pDrawable->pScreen != pMask->pDrawable->pScreen))
return BadMatch; return BadMatch;
CompositePicture (stuff->op, CompositePicture (stuff->op,
pSrc, pSrc,