[PATCH 3/3] fb: Don't crash if copy_drawable() returns NULL.
Michel Dänzer
michel at daenzer.net
Mon Nov 30 04:17:53 PST 2009
From: Michel Dänzer <daenzer at vmware.com>
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24634 .
Signed-off-by: Michel Dänzer <daenzer at vmware.com>
---
fb/fbpict.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 2fbef15..7ae3ec5 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -329,9 +329,11 @@ create_bits_picture (PicturePtr pict,
pixman_image_t *image;
DrawablePtr drawable;
- if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW)
+ if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW) {
drawable = copy_drawable (pict->pDrawable);
- else
+ if (!drawable)
+ return NULL;
+ } else
drawable = pict->pDrawable;
fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
--
1.6.5.3
More information about the xorg-devel
mailing list