ProcSMapsFile might not be a valid file descriptor

in which case don't send it, which then implies we might have an empty shareFDs which we can treat the same as a nonexisting shareFDs Signed-off-by: Caolán McNamara <[email protected]> Change-Id: I80a78a01c69dbee5ee28a64442a5069a6c2b4dbe
CollaboraOnline · Oct 14, 2023 · 8d42849 · 8d42849
1 parent a1b2091
commit 8d42849
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
@@ -3167,7 +3167,8 @@ void lokit_main(
 #if !MOBILEAPP
 
         std::vector<int> shareFDs;
-        shareFDs.push_back(ProcSMapsFile);
+        if (ProcSMapsFile >= 0)
+            shareFDs.push_back(ProcSMapsFile);
 
         if (isURPEnabled())
         {

diff --git a/net/Socket.cpp b/net/Socket.cpp
@@ -626,7 +626,7 @@ bool SocketPoll::insertNewUnixSocket(
     req.set("Pragma", "no-cache");
 
     LOG_TRC("Requesting upgrade of websocket at path " << pathAndQuery << " #" << socket->getFD());
-    if (!shareFDs)
+    if (!shareFDs || shareFDs->empty())
     {
         socket->send(req);
     }