summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-08 15:19:03 -0700
committerJamey Sharp <jamey@minilop.net>2010-05-12 18:00:29 -0700
commitafcbbd6dfea51c5b0adca0d720edc02ba0c2dc16 (patch)
tree036b55ca0eb795c59a8055efb5c0b8367e0873c7
parent59857ee5da5f1f3f4900292581b9586477513211 (diff)
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 <jamey@minilop.net> Cc: Eamon Walsh <ewalsh@tycho.nsa.gov> Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
-rw-r--r--dix/dixfonts.c2
1 files changed, 1 insertions, 1 deletions
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;