From ab1a0249ba5e3174f18a1db212bc511fd7d74cb0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 9 May 2006 22:36:01 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20#6867:=20Yet=20another=20Render=20crash?= =?UTF-8?q?=20fix.=20(Michel=20D=C3=A4nzer)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 +++++ render/render.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c18ab0c76..e38cddaea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-09 Adam Jackson + + * render/render.c: + Bug #6867: Yet another Render crash fix. (Michel Dänzer) + 2006-05-09 Adam Jackson * configure.ac: 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,