From afcbbd6dfea51c5b0adca0d720edc02ba0c2dc16 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 8 May 2010 15:19:03 -0700 Subject: [PATCH] doPolyText needs UseAccess to each font, not ReadAccess. In commit 42d6112ec21949a336ee8b34469f2695273ee2d6, Eamon changed dixChangeGC to require DixUseAccess on any GCFont XID. I think doPolyText needs to require the same level of access. Otherwise dixChangeGC could fail when it does the same lookup, which doPolyText doesn't check for. Signed-off-by: Jamey Sharp Cc: Eamon Walsh Reviewed-by: Eamon Walsh --- dix/dixfonts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/dixfonts.c b/dix/dixfonts.c index e145254b9..378c38033 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1235,7 +1235,7 @@ doPolyText(ClientPtr client, PTclosurePtr c) | ((Font)*(c->pElt+2)) << 16 | ((Font)*(c->pElt+1)) << 24; err = dixLookupResourceByType((pointer *)&pFont, fid, RT_FONT, - client, DixReadAccess); + client, DixUseAccess); if (err != Success) { err = (err == BadValue) ? BadFont : err;