xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Tue Oct 6 10:19:30 PDT 2015
render/picture.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 211d4c2d353b5e379716484055a3f58235ea65f4
Author: Chris Wilson <chris at 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 at chris-wilson.co.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/render/picture.c b/render/picture.c
index 3d52dec..6d9c9df 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -862,7 +862,11 @@ createSourcePicture(void)
{
PicturePtr pPicture;
- pPicture = dixAllocateScreenObjectWithPrivates(NULL, PictureRec, PRIVATE_PICTURE);
+ pPicture = dixAllocateScreenObjectWithPrivates(NULL, PictureRec,
+ PRIVATE_PICTURE);
+ if (!pPicture)
+ return 0;
+
pPicture->pDrawable = 0;
pPicture->pFormat = 0;
pPicture->pNext = 0;
More information about the xorg-commit
mailing list