From 5d7ec3493cfeca74959dc70d3d3a6b36ee38f1fe Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 25 Nov 2025 00:50:54 +0200 Subject: [PATCH] glamor: avoid null dereference in glamor_dash_setup() 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_dash.c:152:10: warning[-Wanalyzer-null-dereference]: dereference of NULL ‘0’ Signed-off-by: Alan Coopersmith Part-of: --- glamor/glamor_dash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c index f7db693fe..b0d436c74 100644 --- a/glamor/glamor_dash.c +++ b/glamor/glamor_dash.c @@ -151,7 +151,7 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc) dash_pixmap = glamor_get_dash_pixmap(gc); dash_priv = glamor_get_pixmap_private(dash_pixmap); - if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dash_priv)) + if (!dash_priv || !GLAMOR_PIXMAP_PRIV_HAS_FBO(dash_priv)) goto bail; glamor_make_current(glamor_priv);