diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 23:59:22 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 02:54:13 +0100 |
commit | d59e8d7f43d8a39155cb4d1884cf65b871fd3de6 (patch) | |
tree | 91e169bd6be9f5480cbf1a4ffcf8d85ecf6efa95 /nx-X11/programs/Xserver/xfixes/region.c | |
parent | 5706005f72d79716fadaabdb6d560bfeb30ff6df (diff) | |
download | nx-libs-d59e8d7f43d8a39155cb4d1884cf65b871fd3de6.tar.gz nx-libs-d59e8d7f43d8a39155cb4d1884cf65b871fd3de6.tar.bz2 nx-libs-d59e8d7f43d8a39155cb4d1884cf65b871fd3de6.zip |
Lift XFIXES to xorg-xserver-1.4.2 state
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/region.c')
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/region.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 4abe9083d..9ac1fae3f 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -217,12 +217,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 +624,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) |