aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-02 17:33:15 +0000
committermarha <marha@users.sourceforge.net>2009-12-02 17:33:15 +0000
commit314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (patch)
tree181562a86ee74db9182bd9b60d258d3fed6642ee /xorg-server/fb
parent4ac4a5b7ce8cc8f195d69a42da10d386eaa5c056 (diff)
downloadvcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.gz
vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.bz2
vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.zip
Xserver git update
Diffstat (limited to 'xorg-server/fb')
-rw-r--r--xorg-server/fb/fbpict.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index 2fbef15c3..7ae3ec5fd 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/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);