From 9d13313511242f8b3d2f6903932d086b61a31eef Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 7 May 2025 13:14:38 +0200
Subject: [PATCH] dix: extra NULL protection in UnmapSubwindows()

Even though it probably won't be hit ever, it's still better to be
really sure instead of some remote chance for hard segfault.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/window.c b/dix/window.c
index 6e7b3e125..052961ef4 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2915,7 +2915,7 @@ UnmapSubwindows(WindowPtr pWin)
                 UnrealizeTree(pChild, FALSE);
         }
     }
-    if (wasViewable && anyMarked) {
+    if (wasViewable && anyMarked && pLayerWin) {
         if (pLayerWin->parent == pWin)
             (*pScreen->MarkWindow) (pWin);
         else {