diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-05-09 22:35:52 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-05-09 22:35:52 +0000 |
| commit | 3a332610eb5853652263139bce4db4ba2242dd48 (patch) | |
| tree | acc726d00449e38f4254aaa6a6ef79f07052c009 | |
| parent | 421576f413b40ee58220e7d57fa0033f2cbee259 (diff) | |
Bug #6867: Yet another Render crash fix. (Michel Dänzer)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | render/render.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 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> + * configure.ac: * hw/xfree86/Makefile.am: * hw/xfree86/common/Makefile.am: diff --git a/render/render.c b/render/render.c index 6cd862162..73522ee66 100644 --- a/render/render.c +++ b/render/render.c @@ -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 $ * @@ -747,7 +747,7 @@ ProcRenderComposite (ClientPtr client) VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, RenderErrBase + BadPicture); 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; CompositePicture (stuff->op, pSrc, |