From a60c7283e677ed81a466d1c0c864c8a05e192cac Mon Sep 17 00:00:00 2001
From: vaxerski <vaxry@vaxry.net>
Date: Wed, 29 May 2024 09:34:18 +0200
Subject: [PATCH] xwayland: verify new xsurf is valid in prop reads

fixes #6250
---
 src/xwayland/XWM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xwayland/XWM.cpp b/src/xwayland/XWM.cpp
index 9e308314..b0f8d6aa 100644
--- a/src/xwayland/XWM.cpp
+++ b/src/xwayland/XWM.cpp
@@ -210,7 +210,7 @@ void CXWM::readProp(SP<CXWaylandSurface> XSURF, uint32_t atom, xcb_get_property_
             const auto XID   = (xcb_window_t*)xcb_get_property_value(reply);
             XSURF->transient = XID;
             if (XID) {
-                if (const auto NEWXSURF = windowForXID(*XID); !lookupParentExists(XSURF, NEWXSURF)) {
+                if (const auto NEWXSURF = windowForXID(*XID); NEWXSURF && !lookupParentExists(XSURF, NEWXSURF)) {
                     XSURF->parent = NEWXSURF;
                     NEWXSURF->children.push_back(XSURF);
                 } else