From 4db6ede54d331186dc52cf061eeded9f308c9855 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 25 Nov 2025 00:52:37 +0200 Subject: [PATCH] glamor: avoid null dereference in glamor_composite_clipped_region() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported in https://gitlab.freedesktop.org/xorg/xserver/-/issues/1817: xwayland-24.1.6/redhat-linux-build/../glamor/glamor_render.c:1577:21: warning[-Wanalyzer-null-dereference]: dereference of NULL ‘0’ Signed-off-by: Alan Coopersmith Part-of: --- 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 87e683e8e..ca1a5cbab 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -1584,7 +1584,7 @@ glamor_composite_clipped_region(CARD8 op, if (source && ((!source->pDrawable && (source->pSourcePict->type != SourcePictTypeSolidFill)) - || (source->pDrawable + || (source->pDrawable && source_pixmap && !GLAMOR_PIXMAP_PRIV_HAS_FBO(source_pixmap_priv) && (source_pixmap->drawable.width != width || source_pixmap->drawable.height != height)))) {