diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
| commit | 24fb0da18f1c44dfa1f76d8cde8efbb958aa7659 (patch) | |
| tree | 76157bb2f88c9383b0824476a9e3a9f9a1bff9fa /xorg-server/xfixes | |
| parent | 6876c31f186414ce975180af79902314c8cdc82a (diff) | |
| parent | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (diff) | |
| download | vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.gz vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.bz2 vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/glext.h
xorg-server/.gitignore
xorg-server/glx/glxext.c
Diffstat (limited to 'xorg-server/xfixes')
| -rw-r--r-- | xorg-server/xfixes/region.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c index cc8f1a5ef..f9de52542 100644 --- a/xorg-server/xfixes/region.c +++ b/xorg-server/xfixes/region.c @@ -269,6 +269,9 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client) VERIFY_PICTURE(pPicture, stuff->picture, client, DixGetAttrAccess); + if (!pPicture->pDrawable) + return RenderErrBase + BadPicture; + switch (pPicture->clientClipType) { case CT_PIXMAP: pRegion = BitmapToRegion(pPicture->pDrawable->pScreen, @@ -750,6 +753,9 @@ ProcXFixesSetPictureClipRegion(ClientPtr client) VERIFY_PICTURE(pPicture, stuff->picture, client, DixSetAttrAccess); VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixReadAccess); + if (!pPicture->pDrawable) + return RenderErrBase + BadPicture; + return SetPictureClipRegion(pPicture, stuff->xOrigin, stuff->yOrigin, pRegion); } |