diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 03:00:24 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 03:00:24 +0100 |
| commit | b40dec982d17b010cedc183ebdc4c75ca7de785f (patch) | |
| tree | 915451e80a2c988779741b596c64ef870cbecfdb /nx-X11/programs/Xserver/xfixes/region.c | |
| parent | 164263e1a12fc8a3a496739799cb60d547857f0a (diff) | |
| parent | 35d166b808939a1518c011d0469125b69dc768d7 (diff) | |
| download | nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.tar.gz nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.tar.bz2 nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.zip | |
Merge branch 'uli42-pr/update_xfixes' into 3.6.x
Attributes GH PR #645: https://github.com/ArcticaProject/nx-libs/pull/645
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/region.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/region.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 18b1d3ff4..ba8c62835 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -1,6 +1,4 @@ /* - * $Id: region.c,v 1.7 2005/07/03 07:37:35 daniels Exp $ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -217,12 +215,21 @@ ProcXFixesCreateRegionFromGC (ClientPtr client) { RegionPtr pRegion, pClip; GCPtr pGC; +#ifndef NXAGENT_SERVER + int rc; +#endif REQUEST (xXFixesCreateRegionFromGCReq); REQUEST_SIZE_MATCH (xXFixesCreateRegionFromGCReq); LEGAL_NEW_RESOURCE (stuff->region, client); +#ifndef NXAGENT_SERVER + rc = dixLookupGC(&pGC, stuff->gc, client, DixReadAccess); + if (rc != Success) + return rc; +#else SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess); +#endif switch (pGC->clientClipType) { case CT_PIXMAP: @@ -615,10 +622,20 @@ ProcXFixesSetGCClipRegion (ClientPtr client) GCPtr pGC; RegionPtr pRegion; XID vals[2]; +#ifndef NXAGENT_SERVER + int rc; +#endif REQUEST(xXFixesSetGCClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq); + +#ifndef NXAGENT_SERVER + rc = dixLookupGC(&pGC, stuff->gc, client, DixWriteAccess); + if (rc != Success) + return rc; +#else SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixWriteAccess); +#endif VERIFY_REGION_OR_NONE (pRegion, stuff->region, client, DixReadAccess); if (pRegion) |