diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-09 15:27:34 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-09 15:27:34 -0800 |
| commit | da09964a931cc64d05ab571bf545fdad35a6d395 (patch) | |
| tree | 74df8983ff0ab97a7881b8d4c0fdc3df74aa4cb3 /Xext/xf86bigfont.c | |
| parent | e1f73d220873fa091695e46b7fcd008663a95a6f (diff) | |
| parent | e3aa6ad201eb20862c11c000e76206e317a96dc9 (diff) | |
Merge branch 'origin' into pci-rework
Conflicts:
hw/xfree86/int10/generic.c
Diffstat (limited to 'Xext/xf86bigfont.c')
| -rw-r--r-- | Xext/xf86bigfont.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index bd250569e..f50481f78 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -445,11 +445,10 @@ ProcXF86BigfontQueryFont( #endif client->errorValue = stuff->id; /* EITHER font or gc */ pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { - /* can't use VERIFY_GC because it might return BadGC */ GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC, - SecurityReadAccess); + DixReadAccess); if (!pGC) { client->errorValue = stuff->id; return BadFont; /* procotol spec says only error is BadFont */ |