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/randr/rroutput.c | |
| 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/randr/rroutput.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rroutput.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index 8042b719c..9c52eaed6 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -74,13 +74,10 @@ RROutputCreate(ScreenPtr pScreen, pScrPriv = rrGetScrPriv(pScreen); - if (pScrPriv->numOutputs) - outputs = reallocarray(pScrPriv->outputs, - pScrPriv->numOutputs + 1, sizeof(RROutputPtr)); - else - outputs = malloc(sizeof(RROutputPtr)); + outputs = reallocarray(pScrPriv->outputs, + pScrPriv->numOutputs + 1, sizeof(RROutputPtr)); if (!outputs) - return FALSE; + return NULL; pScrPriv->outputs = outputs; |