diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-09-28 07:53:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-09-28 07:53:57 +0200 |
| commit | f9653af3bab5e398310bffdc1c49053fd722dcc8 (patch) | |
| tree | 7f448b9a6ade47fda68364c311aeaae3f966d3fd | |
| parent | da6b89f7e89fcb0858e6e32188a2f72d1c75366d (diff) | |
| parent | 3a022e35c35c832ec3db812c5786c2dd84930e45 (diff) | |
| download | nx-libs-f9653af3bab5e398310bffdc1c49053fd722dcc8.tar.gz nx-libs-f9653af3bab5e398310bffdc1c49053fd722dcc8.tar.bz2 nx-libs-f9653af3bab5e398310bffdc1c49053fd722dcc8.zip | |
Merge branch 'uli42-pr/backported_fixes' into 3.6.x
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrmode.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrscreen.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index db0af33b8..de51bec81 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -99,7 +99,7 @@ RRModeCreate (xRRModeInfo *modeInfo, mode->mode.id = FakeClientID(0); if (!AddResource(mode->mode.id, RRModeType, (pointer) mode)) { - free(newModes); + xfree(newModes); return NULL; } modes = newModes; diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index a3851bd60..70a9be0c6 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -943,12 +943,12 @@ ProcRRSetScreenConfig (ClientPtr client) if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { client->errorValue = width; - free(pData); + xfree (pData); return BadValue; } if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) { client->errorValue = height; - free(pData); + xfree (pData); return BadValue; } |