diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
| commit | 20029dbc8f7d03211ceaf00001418fb75b9df644 (patch) | |
| tree | e8950e052bb5ee4328a052a9cf04efc847c47eff /nx-X11/programs/Xserver/randr/rrscreen.c | |
| parent | 9d41e84ea9baf215c6de11224dc2597cd37359dc (diff) | |
| parent | 3e315cd17a519dbcafff18d4294a6f7bb8070767 (diff) | |
| download | nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.gz nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.bz2 nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.zip | |
Merge branch 'uli42-pr/happyvalgrind' into 3.6.x
Fixes ArcticaProject/nx-libs#325.
Fixes ArcticaProject/nx-libs#326.
Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrscreen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrscreen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index 1a30b29d4..4f59e9aea 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -457,7 +457,7 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen) extraLen = rep.length << 2; if (extraLen) { - extra = malloc(extraLen); + extra = calloc(1,extraLen); if (!extra) { return BadAlloc; } @@ -595,7 +595,7 @@ rrGetScreenResources(ClientPtr client, Bool query) extraLen = rep.length << 2; if (extraLen) { - extra = malloc(extraLen); + extra = calloc(1, extraLen); if (!extra) { free(modes); return BadAlloc; @@ -873,7 +873,7 @@ ProcRRGetScreenInfo(ClientPtr client) extraLen += rep.nrateEnts * sizeof(CARD16); if (extraLen) { - extra = (CARD8 *) malloc(extraLen); + extra = (CARD8 *) calloc(1, extraLen); if (!extra) { free(pData); return BadAlloc; |