frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fb: Don't crash if copy_drawable() returns NULL." 

This reverts commit 66a9616d64.

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
This commit is contained in:
Keith Packard 2009-12-01 11:04:06 -08:00
parent d3e054ac07
commit 0816c5482c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fb/fbpict.c
View File

@ -329,11 +329,9 @@ create_bits_picture (PicturePtr pict,
pixman_image_t *image; pixman_image_t *image;
DrawablePtr drawable; DrawablePtr drawable;
if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW) { if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW)
drawable = copy_drawable (pict->pDrawable); drawable = copy_drawable (pict->pDrawable);
if (!drawable) else
return NULL;
} else
drawable = pict->pDrawable; drawable = pict->pDrawable;
fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff); fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);