From 644538b92fc58f40b7a4645f59534c3f2567864f Mon Sep 17 00:00:00 2001
From: Tom Englund <tomenglund26@gmail.com>
Date: Wed, 31 Jul 2024 17:53:49 +0200
Subject: [PATCH] xwl: clean up fd logic

check if the fd is actually opened before closing, and close the
pipesource FD on exit.
---
 src/xwayland/Server.cpp | 12 ++++++++----
 src/xwayland/Server.hpp |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp
index 3f4e7b43223d..cec582f62343 100644
--- a/src/xwayland/Server.cpp
+++ b/src/xwayland/Server.cpp
@@ -262,13 +262,16 @@ void CXWaylandServer::die() {
     if (pipeSource)
         wl_event_source_remove(pipeSource);
 
-    if (waylandFDs[0])
+    if (pipeFd >= 0)
+        close(pipeFd);
+
+    if (waylandFDs[0] >= 0)
         close(waylandFDs[0]);
-    if (waylandFDs[1])
+    if (waylandFDs[1] >= 0)
         close(waylandFDs[1]);
-    if (xwmFDs[0])
+    if (xwmFDs[0] >= 0)
         close(xwmFDs[0]);
-    if (xwmFDs[1])
+    if (xwmFDs[1] >= 0)
         close(xwmFDs[1]);
 
     // possible crash. Better to leak a bit.
@@ -364,6 +367,7 @@ bool CXWaylandServer::start() {
     }
 
     pipeSource = wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, notify[0], WL_EVENT_READABLE, ::xwaylandReady, nullptr);
+    pipeFd     = notify[0];
 
     serverPID = fork();
     if (serverPID < 0) {
diff --git a/src/xwayland/Server.hpp b/src/xwayland/Server.hpp
index 0c06a56c538b..7a36a965f9c2 100644
--- a/src/xwayland/Server.hpp
+++ b/src/xwayland/Server.hpp
@@ -41,6 +41,7 @@ class CXWaylandServer {
     std::array<wl_event_source*, 2> xFDReadEvents = {nullptr, nullptr};
     wl_event_source*                idleSource    = nullptr;
     wl_event_source*                pipeSource    = nullptr;
+    int                             pipeFd        = -1;
     std::array<int, 2>              xwmFDs        = {-1, -1};
     std::array<int, 2>              waylandFDs    = {-1, -1};