From cba10ba5b7c9a027d0fe111a7035d74a4a938750 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 8 Dec 2022 17:43:15 +0000
Subject: [PATCH] fix memory safety in getWindowFromSurface

---
 src/Compositor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 942479e0..c0fec3ad 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -911,6 +911,9 @@ wlr_surface* CCompositor::vectorToLayerSurface(const Vector2D& pos, std::vector<
 
 CWindow* CCompositor::getWindowFromSurface(wlr_surface* pSurface) {
     for (auto& w : m_vWindows) {
+        if (!w->m_bIsMapped || w->m_bFadingOut || !w->m_bMappedX11)
+            continue;
+
         if (g_pXWaylandManager->getWindowSurface(w.get()) == pSurface)
             return w.get();
     }