diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
| commit | 8f2c5e2f41f211bed814be2889da16fc43e6f147 (patch) | |
| tree | e1f2715f63544d39302d6daa2cb0d4f53d295ebc /xorg-server/fb | |
| parent | b404fe88bb87f42267cab4682b81f38cc442e617 (diff) | |
| parent | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (diff) | |
| download | vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.gz vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.bz2 vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/fbpict.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c index 9a40443d1..7bab9a236 100644 --- a/xorg-server/fb/fbpict.c +++ b/xorg-server/fb/fbpict.c @@ -330,9 +330,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);
|