diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-14 17:53:43 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil> | 2006-12-14 17:53:43 -0500 |
| commit | 51b69ff499c05f59cb1e577c4e8abf6f7f283b3e (patch) | |
| tree | 0625ff299fbae31aebef61342fef80278a222dfb /render | |
| parent | 0cf75e74322e2b6a6efc7acf892e04365fde503b (diff) | |
Remove instances of macro SECURITY_VERIFY_DRAWABLE.
Diffstat (limited to 'render')
| -rw-r--r-- | render/render.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/render/render.c b/render/render.c index 51a3fa69a..126d08daf 100644 --- a/render/render.c +++ b/render/render.c @@ -614,15 +614,17 @@ ProcRenderCreatePicture (ClientPtr client) PicturePtr pPicture; DrawablePtr pDrawable; PictFormatPtr pFormat; - int len; - int error; + int len, error, rc; REQUEST(xRenderCreatePictureReq); REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq); LEGAL_NEW_RESOURCE(stuff->pid, client); - SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, - DixWriteAccess); + rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0, + DixWriteAccess); + if (rc != Success) + return rc; + pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, @@ -1687,14 +1689,15 @@ ProcRenderQueryFilters (ClientPtr client) int nnames; ScreenPtr pScreen; PictureScreenPtr ps; - int i, j; - int len; - int total_bytes; + int i, j, len, total_bytes, rc; INT16 *aliases; char *names; REQUEST_SIZE_MATCH(xRenderQueryFiltersReq); - SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, DixReadAccess); + rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0, + DixReadAccess); + if (rc != Success) + return rc; pScreen = pDrawable->pScreen; nbytesName = 0; |