[PATCH xserver 1/2] glamor: handle NULL source pixmap

Olivier Fourdan ofourdan at redhat.com
Tue Jul 25 07:48:39 UTC 2017


COMPOSITE_REGION() can pass NULL as a source pixmap, make sure we
handle that nicely in glamor_composite_clipped_region().

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
---
 glamor/glamor_render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 52f073d05..60c4320dc 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1411,7 +1411,7 @@ glamor_composite_clipped_region(CARD8 op,
            x_source, y_source, x_mask, y_mask, x_dest, y_dest, width, height);
 
     /* Is the composite operation equivalent to a copy? */
-    if (!mask && !source->alphaMap && !dest->alphaMap
+    if (source && !mask && !source->alphaMap && !dest->alphaMap
         && source->pDrawable && !source->transform
         /* CopyArea is only defined with matching depths. */
         && dest->pDrawable->depth == source->pDrawable->depth
-- 
2.13.3



More information about the xorg-devel mailing list