render: Propagate allocation failure from createSourcePicture()

commit 211d4c2d353b5e379716484055a3f58235ea65f4 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Wed Dec 14 15:55:22 2011 +0000 render: Propagate allocation failure from createSourcePicture() All the callers were already checking for failure, except that createSourcePicture() itself was failing to check whether it successfully allocated the Picture. [ajax: Rebase, fix line wrap of preceding line] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>

render: Propagate allocation failure from createSourcePicture()
78eff73e · Ulrich Sibiller · Mike Gabriel · 9f9b790f · 78eff73e · 78eff73e
Commit 78eff73e authored Jun 20, 2019 by Ulrich Sibiller Committed by Mike Gabriel Jun 22, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

NXpicture.c nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +2 -0

picture.c nx-X11/programs/Xserver/render/picture.c +2 -0

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -318,6 +318,8 @@ static PicturePtr createSourcePicture(void)
                               sizeof(nxagentPrivPictureRec);

    pPicture = (PicturePtr) calloc(1, totalPictureSize);
+    if (!pPicture)
+      return 0;

    if (pPicture != NULL)
    {

--- a/nx-X11/programs/Xserver/render/picture.c
+++ b/nx-X11/programs/Xserver/render/picture.c
@@ -979,6 +979,8 @@ static PicturePtr createSourcePicture(void)
 {
    PicturePtr pPicture;
    pPicture = (PicturePtr) malloc(sizeof(PictureRec));
+    if (!pPicture)
+        return 0;
    pPicture->pDrawable = 0;
    pPicture->pFormat = 0;
    pPicture->pNext = 0;