diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-07 07:23:20 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-07 07:23:20 +0100 |
| commit | 5487d52fe1c37244c649c3aefb78600f08ffb91b (patch) | |
| tree | 2d30b58a9044c67c5f844fa9bc424ef7faa4052a /nx-X11/programs/Xserver/xfixes | |
| parent | c571aa9eda7d69b3de1647a208c685a971c9ad38 (diff) | |
| parent | aac4c5f590de3a6dacb01579848b25f6bdd3cc56 (diff) | |
| download | nx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.tar.gz nx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.tar.bz2 nx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.zip | |
Merge branch 'uli42-pr/various_backports' into 3.6.x
Attributes GH PR #581: https://github.com/ArcticaProject/nx-libs/pull/581
Fixes: ArcticaProject/nx-libs#558
Fixes: ArcticaProject/nx-libs#541
Fixes: ArcticaProject/nx-libs#542
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/region.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/xfixes.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 31d19b5ff..18b1d3ff4 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -817,6 +817,7 @@ ProcXFixesExpandRegion (ClientPtr client) RegionInit(&r, &pTmp[i], 0); RegionUnion(pDestination, pDestination, &r); } + free(pTmp); } if (ret == Success) ret = client->noClientException; diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c index add8d1b0e..1403be8c5 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixes.c +++ b/nx-X11/programs/Xserver/xfixes/xfixes.c @@ -120,7 +120,7 @@ ProcXFixesDispatch (ClientPtr client) REQUEST(xXFixesReq); XFixesClientPtr pXFixesClient = GetXFixesClient (client); - if (pXFixesClient->major_version > NUM_VERSION_REQUESTS) + if (pXFixesClient->major_version >= NUM_VERSION_REQUESTS) return BadRequest; if (stuff->xfixesReqType > version_requests[pXFixesClient->major_version]) return BadRequest; |